Azure
/
azure-relay-bridge
зеркало из https://github.com/Azure/azure-relay-bridge.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Test scenario fixes 

Signed-off-by: clemensv <clemensv@microsoft.com>
This commit is contained in:
clemensv 2021-04-29 12:36:47 +02:00
Родитель a4a59a89fb
Коммит 10645d4994
6 изменённых файлов: 20 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
src/azbridge/azbridge.csproj
Просмотреть файл

@ -137,12 +137,11 @@
</ItemGroup>
<ItemGroup Condition="$(RuntimeIdentifier.StartsWith('debian')) OR $(RuntimeIdentifier.StartsWith('ubuntu')) OR $(RuntimeIdentifier.StartsWith('linuxmint'))">
<!-- <DebDependency Include="lttng-ust" Version=""/> -->
<DebDependency Include="libcurl3 | libcurl4" Version="" />
<DebDependency Include="libssl1.0.0 | libssl1.0.2 | libssl1.1" Version="" />
<DebDependency Include="libkrb5-3" Version="" />
<DebDependency Include="libgssapi-krb5-2"/>
<DebDependency Include="zlib1g" Version="" />
<DebDependency Include="libicu52 | libicu55 | libicu57 | libicu60 | libicu62 | libicu63" Version="" />
<DebDependency Include="libicu52 | libicu55 | libicu57 | libicu60 | libicu62 | libicu63 | libicu66 | libicu67" Version="" />
</ItemGroup>
<ItemGroup Condition="$(RuntimeIdentifier.StartsWith('opensuse'))">

1
test/mysql/mysql.server.dockerfile
Просмотреть файл

@ -5,3 +5,4 @@ RUN apt-get update -y
RUN apt-get install -y ./$package_name
RUN mv /usr/local/bin/docker-entrypoint.sh /usr/local/bin/mysql-docker-entrypoint.sh
COPY docker-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint.sh

6
test/nginx/Test.proj
Просмотреть файл

@ -10,15 +10,15 @@
<ImageSuffix Condition="'$(ImageSuffix)' == ''">tar.gz</ImageSuffix>
</PropertyGroup>
<Target Name="BuildImage" Condition=" '$(RuntimeIdentifier)' != '' AND !$(RuntimeIdentifier.StartsWith('osx'))">
<Target Name="BuildImage" Condition=" '$(RuntimeIdentifier)' != '' AND !$(RuntimeIdentifier.StartsWith('osx')) AND !$(RuntimeIdentifier.EndsWith('arm64'))">
<Exec Command="test.cmd build &quot;$(RuntimeIdentifier)&quot; &quot;$(ImageSuffix)&quot; &quot;$(VersionPrefix)&quot; &quot;$(VersionSuffix)&quot; &quot;$(TargetFramework)&quot;" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh build &quot;$(RuntimeIdentifier)&quot; &quot;$(ImageSuffix)&quot; &quot;$(VersionPrefix)&quot; &quot;$(VersionSuffix)&quot; &quot;$(TargetFramework)&quot;" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="VSTestImage" Condition=" '$(RuntimeIdentifier)' != '' AND !$(RuntimeIdentifier.StartsWith('osx'))">
<Target Name="VSTestImage" Condition=" '$(RuntimeIdentifier)' != '' AND !$(RuntimeIdentifier.StartsWith('osx')) AND !$(RuntimeIdentifier.EndsWith('arm64'))">
<Exec Command="test.cmd test &quot;$(RuntimeIdentifier)&quot; &quot;$(ImageSuffix)&quot; &quot;$(VersionPrefix)&quot; &quot;$(VersionSuffix)&quot; &quot;$(TargetFramework)&quot;" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh test &quot;$(RuntimeIdentifier)&quot; &quot;$(ImageSuffix)&quot; &quot;$(VersionPrefix)&quot; &quot;$(VersionSuffix)&quot; &quot;$(TargetFramework)&quot;" Condition="'$(OS)'=='Unix'"/>
</Target>
<Target Name="CleanImage" Condition=" '$(RuntimeIdentifier)' != '' AND !$(RuntimeIdentifier.StartsWith('osx'))">
<Target Name="CleanImage" Condition=" '$(RuntimeIdentifier)' != '' AND !$(RuntimeIdentifier.StartsWith('osx')) AND !$(RuntimeIdentifier.EndsWith('arm64'))">
<Exec Command="test.cmd clean &quot;$(RuntimeIdentifier)&quot; &quot;$(ImageSuffix)&quot; &quot;$(VersionPrefix)&quot; &quot;$(VersionSuffix)&quot; &quot;$(TargetFramework)&quot;" Condition="'$(OS)'=='Windows_NT'"/>
<Exec Command="bash ./test.sh clean &quot;$(RuntimeIdentifier)&quot; &quot;$(ImageSuffix)&quot; &quot;$(VersionPrefix)&quot; &quot;$(VersionSuffix)&quot; &quot;$(TargetFramework)&quot;" Condition="'$(OS)'=='Unix'"/>
</Target>

2
test/nginx/test.sh
Просмотреть файл

@ -58,7 +58,7 @@ else
diff --strip-trailing-cr -B -i -w downloaded.txt index.html
_RESULT=$?
rm downloaded.txt
rm -f downloaded.txt
if [ $_RESULT -eq 0 ]; then
echo OK
exit 0

6
test/nginx/ubuntu.20.04-x64.client.dockerfile Normal file
Просмотреть файл

@ -0,0 +1,6 @@
FROM ubuntu:20.04 AS build
ARG package_name
COPY ./tmp/$package_name .
RUN apt-get update -y
RUN apt-get install -y ./$package_name wget

7
test/nginx/ubuntu.20.04-x64.server.dockerfile Normal file
Просмотреть файл

@ -0,0 +1,7 @@
FROM ubuntu:20.04 AS build
ARG package_name
COPY ./tmp/$package_name .
RUN apt-get update -y
RUN apt-get install -y ./$package_name nginx
COPY index.html /var/www/html