Skip to content

Commit 1c5dc61

Browse files
gbalykovjkotas
authored andcommitted
[release/2.1] Enable Tizen CI (dotnet#19410)
* Remove -rebuild from arm32 CI docker build * Revert "Remove Tizen armel automatic PR triggered jobs" This reverts commit 462e2b5. * Update Tizen rootfs generation scripts for Tizen 5.0 M1 * Update Tizen CI docker image
1 parent 9bff252 commit 1c5dc61

File tree

4 files changed

+31
-25
lines changed

4 files changed

+31
-25
lines changed

cross/armel/tizen-fetch.sh

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/releases/daily/tizen
54+
TIZEN_URL=http://download.tizen.org/releases/milestone/tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -154,23 +154,18 @@ fetch_tizen_pkgs()
154154
done
155155
}
156156

157-
Inform "Initialize arm 4.0-base"
158-
fetch_tizen_pkgs_init arm 4.0-base
157+
Inform "Initialize arm base"
158+
fetch_tizen_pkgs_init standard base
159159
Inform "fetch common packages"
160-
fetch_tizen_pkgs armv7l gcc glibc glibc-devel
160+
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel
161161
fetch_tizen_pkgs noarch linux-glibc-devel
162162
Inform "fetch coreclr packages"
163-
fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel
163+
fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel tizen-release lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
164164
Inform "fetch corefx packages"
165-
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel
165+
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel
166166

167-
Inform "Initialize standard 4.0-unified"
168-
fetch_tizen_pkgs_init standard 4.0-unified
169-
Inform "fetch common packages"
170-
fetch_tizen_pkgs armv7l libicu-devel
171-
Inform "fetch coreclr packages"
172-
fetch_tizen_pkgs armv7l tizen-release lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
167+
Inform "Initialize standard unified"
168+
fetch_tizen_pkgs_init standard unified
173169
Inform "fetch corefx packages"
174-
fetch_tizen_pkgs armv7l gssdp gssdp-devel krb5 krb5-devel libcurl libcurl-devel
175-
170+
fetch_tizen_pkgs armv7l gssdp gssdp-devel
176171

cross/armel/tizen/tizen-dotnet.ks

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ rootpw tizen
88
desktop --autologinuser=root
99
user --name root --groups audio,video --password 'tizen'
1010

11-
repo --name=standard --baseurl=http://download.tizen.org/releases/daily/tizen/4.0-unified/latest/repos/standard/packages/ --ssl_verify=no
12-
repo --name=base --baseurl=http://download.tizen.org/releases/daily/tizen/4.0-base/latest/repos/arm/packages/ --ssl_verify=no
11+
repo --name=standard --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/ --ssl_verify=no
12+
repo --name=base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ --ssl_verify=no
1313

1414
%packages
1515
tar

netci.groovy

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,11 @@ class Constants {
210210
'Checked'
211211
]
212212
],
213+
'Tizen': [
214+
'armem': [
215+
'Checked'
216+
]
217+
],
213218
]
214219

215220
// A set of scenarios that are valid for arm/arm64/armlb tests run on hardware. This is a map from valid scenario name
@@ -974,7 +979,7 @@ def static getDockerImageName(def architecture, def os, def isBuild) {
974979
return "microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180404203310"
975980
}
976981
else if (os == 'Tizen') {
977-
return "hqueue/dotnetcore:ubuntu1404_cross_prereqs_v4-tizen_rootfs"
982+
return "tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
978983
}
979984
}
980985
else if (architecture == 'arm') {
@@ -1686,15 +1691,21 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
16861691
case 'Ubuntu16.04':
16871692
assert scenario != 'innerloop'
16881693
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Build",
1689-
"(?i).*test\\W+${os}\\W+${architecture}\\W+Cross\\W+${configuration}\\W+Build.*")
1694+
"(?i).*test\\W+${os}\\W+${architecture}\\W+Cross\\W+${configuration}\\W+Build.*")
16901695
break
16911696

16921697
case 'Tizen':
16931698
architecture = 'armel'
16941699

1695-
assert scenario != 'innerloop'
1696-
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Build",
1697-
"(?i).*test\\W+${os}\\W+${architecture}\\W+Cross\\W+${configuration}\\W+Build.*")
1700+
if (scenario == 'innerloop') {
1701+
if (configuration == 'Checked') {
1702+
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Innerloop Build and Test")
1703+
}
1704+
}
1705+
else {
1706+
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Build",
1707+
"(?i).*test\\W+${os}\\W+${architecture}\\W+Cross\\W+${configuration}\\W+Build.*")
1708+
}
16981709
break
16991710
}
17001711

tests/scripts/arm32_ci_script.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,10 @@ function cross_build_coreclr_with_docker {
265265
# For armel Tizen, we are going to construct RootFS on the fly.
266266
case $__linuxCodeName in
267267
tizen)
268-
__dockerImage=" hqueue/dotnet-buildtools-prereqs:ubuntu-14.04-cross-0cd4667-20172211042239-tizen-rootfs-20170925"
268+
__dockerImage=" tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
269269
__skipRootFS=1
270270
__dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.build"
271-
__runtimeOS="tizen.4.0.0"
271+
__runtimeOS="tizen.5.0.0"
272272
;;
273273
*)
274274
echo "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch"
@@ -296,7 +296,7 @@ function cross_build_coreclr_with_docker {
296296

297297
# Cross building coreclr with rootfs in Docker
298298
(set +x; echo "Start cross build coreclr for $__buildArch $__linuxCodeName")
299-
__buildCmd="./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib $__buildConfig $__extraArgs -rebuild"
299+
__buildCmd="./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib $__buildConfig $__extraArgs"
300300
$__dockerCmd $__buildCmd
301301
sudo chown -R $(id -u -n) ./bin
302302
}
@@ -388,7 +388,7 @@ function run_tests_using_docker {
388388
elif [ "$__buildArch" == "armel" ]; then
389389
case $__linuxCodeName in
390390
tizen)
391-
__dockerImage=" hqueue/dotnet-buildtools-prereqs:ubuntu-14.04-cross-0cd4667-20172211042239-tizen-rootfs-20170925"
391+
__dockerImage=" tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
392392
__skipRootFS=1
393393
__dockerEnvironmentVariables=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.test"
394394
;;

0 commit comments

Comments
 (0)