From d939c8fce36b256c4b3ac10d04979aca1d398dcc Mon Sep 17 00:00:00 2001 From: Gleb Balykov Date: Sat, 28 Apr 2018 18:08:33 +0300 Subject: [PATCH 1/5] Revert "Disable Tizen CI runs" This reverts commit 37774fd4ee68b2f9dfb5509301893e76e7e3bd5f. --- netci.groovy | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) 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 From a6ef8e2ed2b267d3eb790f7638dad6a3c9b05050 Mon Sep 17 00:00:00 2001 From: Gleb Balykov Date: Sat, 28 Apr 2018 18:10:48 +0300 Subject: [PATCH 2/5] Update Tizen CI docker image --- cross/arm32_ci_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/arm32_ci_script.sh b/cross/arm32_ci_script.sh index 991842aa8929..da1c2fd06135 100755 --- a/cross/arm32_ci_script.sh +++ b/cross/arm32_ci_script.sh @@ -208,7 +208,7 @@ 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=" gbalykov/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-4.0m2" __skipRootFS=1 __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.build" __runtimeOS="tizen.4.0.0" From 8fb2d86b314a67b0543c85172a056a82dc485e0d Mon Sep 17 00:00:00 2001 From: Gleb Balykov Date: Mon, 7 May 2018 13:48:18 +0300 Subject: [PATCH 3/5] Update links required for generation of Tizen rootfs --- cross/armel/tizen-fetch.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cross/armel/tizen-fetch.sh b/cross/armel/tizen-fetch.sh index c7a509a7508c..6477465b2931 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/snapshots/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 From 72e0e2aa5505411628c135e9573b04533b285605 Mon Sep 17 00:00:00 2001 From: JongHeonChoi Date: Wed, 20 Jun 2018 22:10:04 +0900 Subject: [PATCH 4/5] Update Tizen CI docker image (tizen-rootfs-5.0m1) (#30480) * Update arm32_ci_script.sh * Update arm32_ci_script.sh * Update arm32_ci_script.sh --- cross/arm32_ci_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/arm32_ci_script.sh b/cross/arm32_ci_script.sh index da1c2fd06135..3536a4a3eeea 100755 --- a/cross/arm32_ci_script.sh +++ b/cross/arm32_ci_script.sh @@ -208,7 +208,7 @@ function cross_build_corefx_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" From 5bacdb45ac480cd5a209d89b9239363e5c13c8ef Mon Sep 17 00:00:00 2001 From: Gleb Balykov Date: Wed, 27 Jun 2018 15:07:20 +0300 Subject: [PATCH 5/5] Update Tizen CI RID (#30692) * Update Tizen RID for CI * Update Tizen url for rootfs generation --- cross/arm32_ci_script.sh | 2 +- cross/armel/tizen-fetch.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cross/arm32_ci_script.sh b/cross/arm32_ci_script.sh index 3536a4a3eeea..66a2cc5dd5bc 100755 --- a/cross/arm32_ci_script.sh +++ b/cross/arm32_ci_script.sh @@ -211,7 +211,7 @@ function cross_build_corefx_with_docker { __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 6477465b2931..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/snapshots/tizen +TIZEN_URL=http://download.tizen.org/releases/milestone/tizen BUILD_XML=build.xml REPOMD_XML=repomd.xml PRIMARY_XML=primary.xml