Add bullseye SDKs to be built for SWA (#1520)

* added SDKs to be built on bullseye for SWA, and fixed tests for once we add the versions * add fix for platform binaries job * add ruby dependency for github actions
2022-08-19 17:20:46 -04:00 · 2022-08-19 17:20:46 -04:00 · 232599e619
--- a/images/build/Dockerfiles/gitHubActions.Dockerfile
+++ b/images/build/Dockerfiles/gitHubActions.Dockerfile
@ -44,6 +44,7 @@ RUN if [ "${DEBIAN_FLAVOR}" = "bullseye" ]; then \
            libicu67 \
            libcurl4 \
            libssl1.1 \
+            libyaml-dev \
        && rm -rf /var/lib/apt/lists/* \
        && curl -LO http://security.debian.org/debian-security/pool/updates/main/libx/libxml2/libxml2_2.9.10+dfsg-6.7+deb11u2_amd64.deb \
        && dpkg -i libxml2_2.9.10+dfsg-6.7+deb11u2_amd64.deb \
--- a/platforms/dotnet/versions/bullseye/versionsToBuild.txt
+++ b/platforms/dotnet/versions/bullseye/versionsToBuild.txt
@ -12,4 +12,24 @@
 3.1.419, 957d9561b346226806270a969a302217dec2a5e4853225d73fbf85f20f6107137ac5678a6ffdf5c170a72f5ef93e3defe3218970bc20d97a4f880d5c7577376f,
 3.1.420, b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3,

-# NOTE: Make sure to set the default version in 'defaultVersion.txt' file
+6.0.100-preview.1.21103.13, 86f591c70c73732030210e8e7ce39b7b4e4a680098862e340a4a8726bcb3f981f0748baec0fce8c5c4a8615670a72ab92bfad8d0dc0a305401bbc5864116996a,
+6.0.100-preview.2.21155.3, 90d9b6070f7732dcf75f5a09a4f10f9b23c835a3bb144e0c3f1fa451cadd3d49c9781973b180f70a4d2798358a7c00f3c0b9b3bf35326fe4c94e470e84ac8c35,
+6.0.100-preview.3.21202.5, f776177c1ca2b672cf05f9ec32f20ef35a039dd8d31beaa139d1e47d71cca4ccf0f2a61bbf006a781e693977ee91cc9e08e12134ffb4c7a03a8e56c163b8661d,
+6.0.100-preview.4.21255.9, 9b4554f9c223ff70083618da7c12a70686d39f7b413583c6a7449bfbb5e871ef281b3f692eefca53864ea57217685bf4d7f80383015b2462666a0a26376e0f97,
+6.0.100-preview.5.21302.13, 000ea38847453f636f81adf3d1083d811b0e4c20585e3735dd599a4009f4289793d4e1e8e75d5f86b73bd9f75e78ce2a68900686f4230ea7ed9a49bdb4e46a83,
+6.0.100-preview.6.21355.2, b4d9282a43fc244f6576ea70b03af1727b5910481f3d5c51c0535c7dfffbc943742041bd8174fdd7ede677f9c99ec917dd3c119710b4a2169862eeacee026ac2,
+6.0.100-preview.7.21379.14, c8757325407b5eb1e3870f0db87eeaf44df978313c0b2a7f465ec7d0a5647317cba597264ec81577ea0b3bd97bd33d782234392e8e592e073126792a0406df7b,
+6.0.100-rc.1.21458.32, 7a20c5ac3f8ae7a5a67b0ddc184e7eb845b57aacea65e42e451c51dd48afb8c854f25a879777f0067617bba131ad0c09fb395c62b3ec292915f9434213523463,
+6.0.100-rc.2.21505.57, 0a8f85a2757f61ca7f9b8c546af4554c2aac9cdb06f6d62879a60de6f2a3d37ea7136f48896c9c85828a2d55df354e7b9b5b4dc22896c927f0c6370a5ade1b9c,
+6.0.100-rtm.21524.1, CB0D174A79D6294C302261B645DBA6A479DA8F7CF6C1FE15AE6998BC09C5E0BAEC810822F9E0104E84B0EFD51FDC0333306CB2A0A6FCDBAF515A8AD8CF1AF25B, https://dotnetstage.blob.core.windows.net/6-0-100-rtm-21527-11-public/Sdk/6.0.100-rtm.21527.11/dotnet-sdk-6.0.100-linux-x64.tar.gz,
+6.0.100, cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b,
+6.0.201, a4d96b6ca2abb7d71cc2c64282f9bd07cedc52c03d8d6668346ae0cd33a9a670d7185ab0037c8f0ecd6c212141038ed9ea9b19a188d1df2aae10b2683ce818ce,
+6.0.300, 52d720e90cfb889a92d605d64e6d0e90b96209e1bd7eab00dab1d567017d7a5a4ff4adbc55aff4cffcea4b1bf92bb8d351859d00d8eb65059eec5e449886c938,
+6.0.301, 2f434ea4860ee637e9cf19991a80e1febb1105531dd96b4fbc728d538ca0ab202a0bdff128fd13b269fac3ba3bc9d5f9c49039a6e0d7d32751e8a2bb6d790446,
+
+7.0.100-preview.1.22110.4, 54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2,
+7.0.100-preview.5.22307.18, 691c0d8917bc9848a08707b7fa22da05228dad0ba6335ff06c6d80f9a95349307572ff45c0b088d9fc199c40a1784ff314e1a8735d0366bd3aa06eb8dfa2b7d5,
+7.0.100-preview.6.22352.1, e49a2119021e4069f1193898536cc59628336e656f2f7e49d454a593a330d8e437acf2f4efb70925bc16a9c900c2e49f4a6c2fb5f69e696b09a91ebccd2c9307,
+7.0.100-preview.7.22377.5, c16d452dbe4f097b75d304c8bc19892017847768bf2e8a0a72fafd6d6b46c3dd77e0c251b80c245197f47fdeafc2c18db255af8a1a5c30be982de19129874390
+
+# NOTE: Make sure to set the default version in 'defaultVersion.txt' file
--- a/platforms/nodejs/versions/bullseye/versionsToBuild.txt
+++ b/platforms/nodejs/versions/bullseye/versionsToBuild.txt
@ -1,3 +1,12 @@
+12.19.0
+12.20.0
+12.21.0
+12.22.0
+12.22.4
+12.22.6
+12.22.9
+12.22.11
+
 14.15.0
 14.15.1
 14.16.0
--- a/platforms/python/versions/bullseye/versionsToBuild.txt
+++ b/platforms/python/versions/bullseye/versionsToBuild.txt
@ -5,6 +5,10 @@
 3.8.6, E3FF2839C048B25C084DEBE9B26995E310250568,
 3.8.12, E3FF2839C048B25C084DEBE9B26995E310250568,

+3.9.0, E3FF2839C048B25C084DEBE9B26995E310250568,
+3.9.1rc1, E3FF2839C048B25C084DEBE9B26995E310250568,
+3.9.7, E3FF2839C048B25C084DEBE9B26995E310250568,
+
 3.10.0a2, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.10.0, A035C8C19219BA821ECEA86B64E628F8D684696D,
 3.10.4, A035C8C19219BA821ECEA86B64E628F8D684696D,
--- a/platforms/ruby/versions/bullseye/versionsToBuild.txt
+++ b/platforms/ruby/versions/bullseye/versionsToBuild.txt
@ -1 +1,9 @@
-# version, sha
+# version, sha
+2.5.8, 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d,
+2.6.6, 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f,
+2.7.1, b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7,
+2.7.2, 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6,
+
+3.0.0, 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1,
+3.0.3, 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c,
+3.1.1, 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa,
--- a/tests/Oryx.BuildImage.Tests/DotNetCore/DotNetCoreDynamicInstallTest.cs
+++ b/tests/Oryx.BuildImage.Tests/DotNetCore/DotNetCoreDynamicInstallTest.cs
@ -590,13 +590,23 @@ namespace Microsoft.Oryx.BuildImage.Tests
                    NetCore7PreviewMvcApp,
                    imageHelper.GetGitHubActionsBuildImage("github-actions-buster"));

-
-                //buullseye
+                //bullseye
                data.Add(
                    DotNetCoreRunTimeVersions.NetCoreApp31,
                    DotNetCoreSdkVersions.DotNetCore31SdkVersion,
                    NetCoreApp31MvcApp,
                    imageHelper.GetGitHubActionsBuildImage("github-actions-bullseye"));
+                data.Add(
+                    DotNetCoreRunTimeVersions.NetCoreApp60,
+                    DotNetCoreSdkVersions.DotNet60SdkVersion,
+                    NetCore6PreviewWebApp,
+                    imageHelper.GetGitHubActionsBuildImage("github-actions-bullseye"));
+                data.Add(
+                    DotNetCoreRunTimeVersions.NetCoreApp70,
+                    DotNetCoreSdkVersions.DotNet70SdkVersion,
+                    NetCore7PreviewMvcApp,
+                    imageHelper.GetGitHubActionsBuildImage("github-actions-bullseye"));
+                
                return data;
            }
        }
@ -663,8 +673,6 @@ namespace Microsoft.Oryx.BuildImage.Tests
                data.Add(DotNetCoreRunTimeVersions.NetCoreApp22, imageHelper.GetGitHubActionsBuildImage("github-actions-bullseye"));
                data.Add(DotNetCoreRunTimeVersions.NetCoreApp30, imageHelper.GetGitHubActionsBuildImage("github-actions-bullseye"));
                data.Add(DotNetCoreRunTimeVersions.NetCoreApp50, imageHelper.GetGitHubActionsBuildImage("github-actions-bullseye"));
-                data.Add(DotNetCoreRunTimeVersions.NetCoreApp60, imageHelper.GetGitHubActionsBuildImage("github-actions-bullseye"));
-                data.Add(DotNetCoreRunTimeVersions.NetCoreApp70, imageHelper.GetGitHubActionsBuildImage("github-actions-bullseye"));
                return data;
            }
        }
--- a/tests/Oryx.BuildImage.Tests/Python/PythonDynamicInstallationTest.cs
+++ b/tests/Oryx.BuildImage.Tests/Python/PythonDynamicInstallationTest.cs
@ -358,6 +358,7 @@ namespace Microsoft.Oryx.BuildImage.Tests
                //bullseye
                data.Add(PythonVersions.Python37Version, imageHelper.GetAzureFunctionsJamStackBuildImage("azfunc-jamstack-bullseye"));
                data.Add(PythonVersions.Python38Version, imageHelper.GetAzureFunctionsJamStackBuildImage("azfunc-jamstack-bullseye"));
+                data.Add(PythonVersions.Python39Version, imageHelper.GetAzureFunctionsJamStackBuildImage("azfunc-jamstack-bullseye"));
                data.Add(PythonVersions.Python310Version, imageHelper.GetAzureFunctionsJamStackBuildImage("azfunc-jamstack-bullseye"));
                return data;
            }
@ -418,7 +419,6 @@ namespace Microsoft.Oryx.BuildImage.Tests

                data.Add(PythonVersions.Python27Version, imageHelper.GetAzureFunctionsJamStackBuildImage("azfunc-jamstack-bullseye"));
                data.Add(PythonVersions.Python36Version, imageHelper.GetAzureFunctionsJamStackBuildImage("azfunc-jamstack-bullseye"));
-                data.Add(PythonVersions.Python39Version, imageHelper.GetAzureFunctionsJamStackBuildImage("azfunc-jamstack-bullseye"));
                return data;
            }
        }
--- a/vsts/scripts/publishFilesToAzureStorage.sh
+++ b/vsts/scripts/publishFilesToAzureStorage.sh
@ -41,7 +41,7 @@ uploadFiles() {
            checksum=$(sha256sum $fileToUpload | cut -d " " -f 1)
        fi
        
-        if shouldOverwriteSdk || shouldOverwritePlatformSdk $platform || [[ "$fileToUpload" == defaultVersion* ]]; then
+        if shouldOverwriteSdk || shouldOverwritePlatformSdk $platform || [[ "$fileToUpload" == *defaultVersion*txt ]]; then
            az storage blob upload \
            --name $fileName \
            --file "$fileToUpload" \