Update Tizen CI docker image (dotnet/coreclr#18567)

* Update Tizen rootfs generation scripts for Tizen 5.0 M1

* Update Tizen CI docker image

* Update Tizen CI RID

Commit migrated from https://github.com/dotnet/coreclr/commit/96a47e0f4a48ef3c5c59ec40f69c4923a6699e56

diff --git a/src/coreclr/cross/armel/tizen-fetch.sh b/src/coreclr/cross/armel/tizen-fetch.sh
index a8ab02a..ba16e99 100755 (executable)
--- a/src/coreclr/cross/armel/tizen-fetch.sh
+++ b/src/coreclr/cross/armel/tizen-fetch.sh
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
        mkdir -p $TMPDIR 
 fi
 
-TIZEN_URL=http://download.tizen.org/snapshots/tizen
+TIZEN_URL=http://download.tizen.org/releases/milestone/tizen
 BUILD_XML=build.xml
 REPOMD_XML=repomd.xml
 PRIMARY_XML=primary.xml
@@ -154,8 +154,8 @@ fetch_tizen_pkgs()
        done
 }
 
-Inform "Initialize arm 4.0-base"
-fetch_tizen_pkgs_init arm 4.0-base
+Inform "Initialize arm base"
+fetch_tizen_pkgs_init standard base
 Inform "fetch common packages"
 fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel
 fetch_tizen_pkgs noarch linux-glibc-devel
@@ -164,8 +164,8 @@ fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwi
 Inform "fetch corefx packages"
 fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel
 
-Inform "Initialize standard 4.0-unified"
-fetch_tizen_pkgs_init standard 4.0-unified
+Inform "Initialize standard unified"
+fetch_tizen_pkgs_init standard unified
 Inform "fetch corefx packages"
 fetch_tizen_pkgs armv7l gssdp gssdp-devel
 

diff --git a/src/coreclr/cross/armel/tizen/tizen-dotnet.ks b/src/coreclr/cross/armel/tizen/tizen-dotnet.ks
index b671c4f..506d455 100644 (file)
--- a/src/coreclr/cross/armel/tizen/tizen-dotnet.ks
+++ b/src/coreclr/cross/armel/tizen/tizen-dotnet.ks
@@ -8,8 +8,8 @@ rootpw tizen
 desktop --autologinuser=root
 user --name root  --groups audio,video --password 'tizen'
 
-repo --name=standard  --baseurl=http://download.tizen.org/snapshots/tizen/4.0-unified/latest/repos/standard/packages/ --ssl_verify=no
-repo --name=base      --baseurl=http://download.tizen.org/snapshots/tizen/4.0-base/latest/repos/arm/packages/ --ssl_verify=no
+repo --name=standard  --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/ --ssl_verify=no
+repo --name=base      --baseurl=http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ --ssl_verify=no
 
 %packages
 tar

diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy
index 11aa4a5..27688b5 100755 (executable)
--- a/src/coreclr/netci.groovy
+++ b/src/coreclr/netci.groovy
@@ -1019,7 +1019,7 @@ def static getDockerImageName(def architecture, def os, def isBuild) {
                 return "microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180404203310"
             }
             else if (os == 'Tizen') {
-                return "gbalykov/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-4.0m2"
+                return "tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
             }
         }
         else if (architecture == 'arm') {

diff --git a/src/coreclr/tests/scripts/arm32_ci_script.sh b/src/coreclr/tests/scripts/arm32_ci_script.sh
index 06431f2..51a5494 100755 (executable)
--- a/src/coreclr/tests/scripts/arm32_ci_script.sh
+++ b/src/coreclr/tests/scripts/arm32_ci_script.sh
@@ -265,10 +265,10 @@ function cross_build_coreclr_with_docker {
         # For armel Tizen, we are going to construct RootFS on the fly.
         case $__linuxCodeName in
         tizen)
-            __dockerImage=" gbalykov/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-4.0m2"
+            __dockerImage=" tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
             __skipRootFS=1
             __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.build"
-            __runtimeOS="tizen.4.0.0"
+            __runtimeOS="tizen.5.0.0"
         ;;
         *)
             echo "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch"
@@ -388,7 +388,7 @@ function run_tests_using_docker {
     elif [ "$__buildArch" == "armel" ]; then
         case $__linuxCodeName in
         tizen)
-            __dockerImage=" gbalykov/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-4.0m2"
+            __dockerImage=" tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
             __skipRootFS=1
             __dockerEnvironmentVariables=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.test"
         ;;