Skip to content

Commit 96a47e0

Browse files
edenlee1212jkotas
authored andcommitted
Update Tizen CI docker image (dotnet#18567)
* Update Tizen rootfs generation scripts for Tizen 5.0 M1 * Update Tizen CI docker image * Update Tizen CI RID
1 parent e0e2859 commit 96a47e0

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

cross/armel/tizen-fetch.sh

Lines changed: 5 additions & 5 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/snapshots/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,8 +154,8 @@ 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"
160160
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel
161161
fetch_tizen_pkgs noarch linux-glibc-devel
@@ -164,8 +164,8 @@ fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwi
164164
Inform "fetch corefx packages"
165165
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
167+
Inform "Initialize standard unified"
168+
fetch_tizen_pkgs_init standard unified
169169
Inform "fetch corefx packages"
170170
fetch_tizen_pkgs armv7l gssdp gssdp-devel
171171

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/snapshots/tizen/4.0-unified/latest/repos/standard/packages/ --ssl_verify=no
12-
repo --name=base --baseurl=http://download.tizen.org/snapshots/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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ def static getDockerImageName(def architecture, def os, def isBuild) {
10191019
return "microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180404203310"
10201020
}
10211021
else if (os == 'Tizen') {
1022-
return "gbalykov/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-4.0m2"
1022+
return "tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
10231023
}
10241024
}
10251025
else if (architecture == 'arm') {

tests/scripts/arm32_ci_script.sh

Lines changed: 3 additions & 3 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=" gbalykov/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-4.0m2"
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"
@@ -388,7 +388,7 @@ function run_tests_using_docker {
388388
elif [ "$__buildArch" == "armel" ]; then
389389
case $__linuxCodeName in
390390
tizen)
391-
__dockerImage=" gbalykov/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-4.0m2"
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)