diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-01 19:11:53 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-01 19:11:53 +0000 |
| commit | a03dc654e077577cea796e3b9d86db210ccfc662 (patch) | |
| tree | 084ffde30d17f7e5bfd7b595f14ee3014e65d0b3 | |
| parent | 16507352d62b2a2c3b73d65402c830bf5ec17a80 (diff) | |
*.sh: Switch to *-tcwg-tested docker images.
Change-Id: I0abd9f0c7ec0da98990459cf175eb4e076bdab8d
| -rwxr-xr-x | start-container-docker.sh | 2 | ||||
| -rwxr-xr-x | tcwg-benchmark.sh | 2 | ||||
| -rwxr-xr-x | tcwg-buildfarm.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/start-container-docker.sh b/start-container-docker.sh index 3b33f61f..be210d36 100755 --- a/start-container-docker.sh +++ b/start-container-docker.sh @@ -40,7 +40,7 @@ exec 1>&2 container_arch="default" cp_files=() -distro="trusty" +distro="trusty-tcwg-tested" docker_opts= label= node= diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index f7b6c9cf..15e133f2 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -6,7 +6,7 @@ set -ex # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. -build_container_tag="${build_container_tag:-xenial}" +build_container_tag="${build_container_tag:-xenial-tcwg-tested}" toolchain_url="$toolchain_url" toolchain_type="${toolchain_type:-auto}" bench_list="$bench_list" diff --git a/tcwg-buildfarm.sh b/tcwg-buildfarm.sh index 3548c069..0d64da2b 100755 --- a/tcwg-buildfarm.sh +++ b/tcwg-buildfarm.sh @@ -36,7 +36,7 @@ if echo $runtests | grep -q $target; then bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro ${test_container_tag} --task test --prefix test_ > test-container.sh else # Set weight to "2" to give VM decent amount of RAM. - bash -x ./jenkins-scripts/start-container-qemu.sh --weight 2 --label $tester_label --distro xenial --task test --prefix test_ --kernel_url https://dev-01.tcwglab/~tcwg-buildslave/images/ilp32/norov-Image --initrd_url https://cloud-images.ubuntu.com/releases/16.04/release/unpacked/ubuntu-16.04-server-cloudimg-arm64-initrd-generic > test-container.sh + bash -x ./jenkins-scripts/start-container-qemu.sh --weight 2 --label $tester_label --distro xenial-tcwg-tested --task test --prefix test_ --kernel_url https://dev-01.tcwglab/~tcwg-buildslave/images/ilp32/norov-Image --initrd_url https://cloud-images.ubuntu.com/releases/16.04/release/unpacked/ubuntu-16.04-server-cloudimg-arm64-initrd-generic > test-container.sh fi . ./test-container.sh runtests_opt="$runtests_opt --testcontainer ${test_container_host}:${test_container_port}" |