diff --git a/cross/arm32_ci_script.sh b/cross/arm32_ci_script.sh index 991842aa8929..66a2cc5dd5bc 100755 --- a/cross/arm32_ci_script.sh +++ b/cross/arm32_ci_script.sh @@ -208,10 +208,10 @@ function cross_build_corefx_with_docker { # For armel Tizen, we are going to construct RootFS on the fly. case $__linuxCodeName in tizen) - __dockerImage=" hqueue/dotnetcore:ubuntu1404_cross_prereqs_v4-tizen_rootfs" + __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" diff --git a/cross/armel/tizen-fetch.sh b/cross/armel/tizen-fetch.sh index c7a509a7508c..6f039c6d90f3 100755 --- a/cross/armel/tizen-fetch.sh +++ b/cross/armel/tizen-fetch.sh @@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then mkdir -p $TMPDIR fi -TIZEN_URL=http://download.tizen.org/releases/daily/tizen +TIZEN_URL=http://download.tizen.org/releases/milestone/tizen BUILD_XML=build.xml REPOMD_XML=repomd.xml PRIMARY_XML=primary.xml @@ -157,20 +157,15 @@ fetch_tizen_pkgs() Inform "Initialize base" fetch_tizen_pkgs_init standard base Inform "fetch common packages" -fetch_tizen_pkgs armv7l gcc glibc glibc-devel +fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu-devel fetch_tizen_pkgs noarch linux-glibc-devel Inform "fetch coreclr packages" -fetch_tizen_pkgs armv7l lldb lldb-devel libuuid libuuid-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel +fetch_tizen_pkgs armv7l lldb lldb-devel libuuid libuuid-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel tizen-release Inform "fetch corefx packages" -fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel +fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel Inform "Initialize unified" fetch_tizen_pkgs_init standard unified -Inform "fetch common packages" -fetch_tizen_pkgs armv7l libicu-devel -Inform "fetch coreclr packages" -fetch_tizen_pkgs armv7l tizen-release Inform "fetch corefx packages" -fetch_tizen_pkgs armv7l gssdp gssdp-devel krb5 krb5-devel libcurl libcurl-devel - +fetch_tizen_pkgs armv7l gssdp gssdp-devel diff --git a/netci.groovy b/netci.groovy index d07ef1b78d7a..c741fcf3d4b3 100644 --- a/netci.groovy +++ b/netci.groovy @@ -326,29 +326,20 @@ def targetGroupOsMapInnerloop = ['netcoreapp': ['Windows_NT', 'Ubuntu14.04', 'Ub } } - // Disable Tizen except when explicitly requested. See corefx/issues/28901 - if (osName == "Tizen") { - if (isPR) { - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build", "(?i).*test\\W+${osName}\\W+${abi}\\W+${configurationGroup}.*") - } - } - else - { - // Set up triggers - if (isPR) { - // We run Tizen Debug and Linux Release as default PR builds - if ((osName == "Tizen" && configurationGroup == "Debug") || (osName == "Linux" && configurationGroup == "Release")) { - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build") - } - else { - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build", "(?i).*test\\W+${osName}\\W+${abi}\\W+${configurationGroup}.*") - } + // Set up triggers + if (isPR) { + // We run Tizen Debug and Linux Release as default PR builds + if ((osName == "Tizen" && configurationGroup == "Debug") || (osName == "Linux" && configurationGroup == "Release")) { + Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build") } else { - // Set a push trigger - Utilities.addGithubPushTrigger(newJob) + Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osName} ${abi} ${configurationGroup} Build", "(?i).*test\\W+${osName}\\W+${abi}\\W+${configurationGroup}.*") } } + else { + // Set a push trigger + Utilities.addGithubPushTrigger(newJob) + } } // osName } // configurationGroup } // targetGroup