Update Tizen CI docker image and links for rootfs generation

Commit migrated from dotnet/core-setup@b374e2e
kmett · Oct 3, 2018 · 06f8bb3 · 06f8bb3
1 parent 4195e2b
commit 06f8bb3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/installer/cross/armel/tizen-fetch.sh b/src/installer/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/installer/cross/armel/tizen/tizen-dotnet.ks b/src/installer/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/installer/netci.groovy b/src/installer/netci.groovy
@@ -44,11 +44,11 @@ platformList.each { platform ->
         }
     }
     else if (os == 'Tizen') {
-        dockerRepository = "gbalykov/dotnet-buildtools-prereqs"
-        dockerContainer = "ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-4.0m2"
+        dockerRepository = "tizendotnet/dotnet-buildtools-prereqs"
+        dockerContainer = "ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
 
         dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture}.tizen.build --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}"
-        buildArgs += " -SkipTests=true -DisableCrossgen=true -PortableBuild=false -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json /p:OutputRid=tizen.4.0.0-${architecture}"
+        buildArgs += " -SkipTests=true -DisableCrossgen=true -PortableBuild=false -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json /p:OutputRid=tizen.5.0.0-${architecture}"
         buildCommand = "${dockerCommand} ./build.sh ${buildArgs}"
     }
     else if (os == "Linux") {

diff --git a/tools-local/scripts/arm32_ci_script.sh b/tools-local/scripts/arm32_ci_script.sh
@@ -189,8 +189,8 @@ function cross_build_core_setup_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"
-            __runtimeOS="tizen.4.0.0"
+            __dockerImage=" tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
+            __runtimeOS="tizen.5.0.0"
         ;;
         *)
             echo "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch"