summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xstart-container-docker.sh2
-rwxr-xr-xtcwg-benchmark.sh4
-rwxr-xr-xtcwg-buildfarm.sh4
3 files changed, 5 insertions, 5 deletions
diff --git a/start-container-docker.sh b/start-container-docker.sh
index 4cf58796..7bdefbc3 100755
--- a/start-container-docker.sh
+++ b/start-container-docker.sh
@@ -205,7 +205,7 @@ if [ x"$session_name" = x ]; then
fi
if [ x"$distro" = x"default" ]; then
- distro="trusty-tcwg-tested"
+ distro="trusty"
fi
image=linaro/ci-${container_arch}-tcwg-build-ubuntu:${distro}
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh
index fba0acb0..9166dae5 100755
--- a/tcwg-benchmark.sh
+++ b/tcwg-benchmark.sh
@@ -6,8 +6,8 @@ set -ex
# Make shellcheck happy and workaround Jenkins not defining variables
# for empty arguments.
-bench_container_tag="${bench_container_tag-bionic-tcwg-tested}"
-build_container_tag="${build_container_tag-bionic-tcwg-tested}"
+bench_container_tag="${bench_container_tag-bionic}"
+build_container_tag="${build_container_tag-bionic}"
toolchain_url="$toolchain_url"
toolchain_type="${toolchain_type-auto}"
bench_list="$bench_list"
diff --git a/tcwg-buildfarm.sh b/tcwg-buildfarm.sh
index c17c16b5..a361f68f 100755
--- a/tcwg-buildfarm.sh
+++ b/tcwg-buildfarm.sh
@@ -29,8 +29,8 @@ log_name="${log_name-$target}"
dont_fail="${dont_fail-false}"
log_server="${log_server-dev-01.tcwglab:$HOME/logs}"
abe_branch="${abe_branch-refs/heads/tested}"
-build_container_tag="${build_container_tag-xenial-tcwg-tested}"
-test_container_tag="${test_container_tag-xenial-tcwg-tested}"
+build_container_tag="${build_container_tag-xenial}"
+test_container_tag="${test_container_tag-xenial}"
binaries="${binaries-false}"
dryrun="${dryrun-false}"