From 8dfba3d62cfefdffee0270d396f607d4ad948572 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 31 Mar 2020 12:55:15 +0000 Subject: tcwg-*: Use "master" docker images instead of "tcwg-tested" ... due to https://projects.linaro.org/browse/LSS-1153 . Change-Id: I2d12e72be6be28860b1893a82d7543e6794a2c44 --- tcwg-abe-tested.yaml | 2 +- tcwg-buildfarm.yaml | 4 ++-- tcwg-dev-build-christophe.yaml | 2 +- tcwg-dev-build.yaml | 2 +- tcwg-gcc-bisect.yaml | 2 +- tcwg-infra-update-home.yaml | 2 +- tcwg-llvm-release.yaml | 2 +- tcwg-llvm-staged-build.yaml | 2 +- tcwg-llvm-testsuite.yaml | 2 +- tcwg-make-release.yaml | 2 +- tcwg-update-host-containers.yaml | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tcwg-abe-tested.yaml b/tcwg-abe-tested.yaml index 3789169e92..52e935969e 100644 --- a/tcwg-abe-tested.yaml +++ b/tcwg-abe-tested.yaml @@ -74,7 +74,7 @@ description: 'Do not run tests, and just update abe:tested' - string: name: distro - default: 'xenial-tcwg-tested' + default: 'xenial' description: 'Distro image to use' disabled: false node: tcwg-coordinator diff --git a/tcwg-buildfarm.yaml b/tcwg-buildfarm.yaml index b35cc4a51f..5c86f74e0b 100644 --- a/tcwg-buildfarm.yaml +++ b/tcwg-buildfarm.yaml @@ -80,11 +80,11 @@ description: 'Scripts branch to use' - string: name: build_container_tag - default: 'xenial-tcwg-tested' + default: 'xenial' description: 'Distro to use on the builder with non-default container type: trusty, xenial.' - string: name: test_container_tag - default: 'xenial-tcwg-tested' + default: 'xenial' description: 'Distro to use in the test container: trusty, xenial.' - string: name: displaytag diff --git a/tcwg-dev-build-christophe.yaml b/tcwg-dev-build-christophe.yaml index 0c23300da9..d09a3d6a0b 100644 --- a/tcwg-dev-build-christophe.yaml +++ b/tcwg-dev-build-christophe.yaml @@ -62,7 +62,7 @@ description: 'Scripts revision to use' - string: name: build_container_tag - default: xenial-tcwg-tested + default: xenial description: 'Distro to use on the builder with non-default container type: trusty, xenial.' disabled: false node: tcwg-x86_64-build diff --git a/tcwg-dev-build.yaml b/tcwg-dev-build.yaml index 819a18b183..25623ba3b6 100644 --- a/tcwg-dev-build.yaml +++ b/tcwg-dev-build.yaml @@ -91,7 +91,7 @@ #!/bin/bash set -ex abe_branch=tested - distro=xenial-tcwg-tested + distro=xenial eval $extra_options ./docker-run.sh --distro "$distro" -- ./tcwg-dev-build.sh \ --abe_branch "$abe_branch" \ diff --git a/tcwg-gcc-bisect.yaml b/tcwg-gcc-bisect.yaml index 4a995fe3cb..3b2346285c 100644 --- a/tcwg-gcc-bisect.yaml +++ b/tcwg-gcc-bisect.yaml @@ -48,7 +48,7 @@ description: 'Bad GIT revision' - string: name: build_container_tag - default: 'xenial-tcwg-tested' + default: 'xenial' description: 'Distro to use on the builder: trusty, xenial.' disabled: false node: tcwg-x86_64-cam diff --git a/tcwg-infra-update-home.yaml b/tcwg-infra-update-home.yaml index 678de670b2..09499355ae 100644 --- a/tcwg-infra-update-home.yaml +++ b/tcwg-infra-update-home.yaml @@ -39,7 +39,7 @@ - project-compare-type: 'PLAIN' project-pattern: 'ci/dockerfiles' branches: - - branch-pattern: 'tcwg-tested' + - branch-pattern: 'master' file-paths: - compare-type: ANT pattern: tcwg-base/home-data/tcwg-buildslave/** diff --git a/tcwg-llvm-release.yaml b/tcwg-llvm-release.yaml index 02c39b8db0..9bfcd58399 100644 --- a/tcwg-llvm-release.yaml +++ b/tcwg-llvm-release.yaml @@ -28,7 +28,7 @@ description: 'URL of the toolchain to use. This needs to be a tarball with a /bin directory inside with either GCC or LLVM from make install' - string: name: build_container_tag - default: 'bionic-tcwg-tested' + default: 'bionic' description: 'Type of image to use in the container: trusty, xenial.' - string: name: compiler diff --git a/tcwg-llvm-staged-build.yaml b/tcwg-llvm-staged-build.yaml index bdc222d232..9bb4597ce2 100644 --- a/tcwg-llvm-staged-build.yaml +++ b/tcwg-llvm-staged-build.yaml @@ -32,7 +32,7 @@ description: 'Additional CMake flags, ex. CMAKE_CXX_FLAGS, etc.' - string: name: build_container_tag - default: 'xenial-tcwg-tested' + default: 'xenial' description: 'Type of image to use in the container: trusty, xenial.' - bool: name: twostage diff --git a/tcwg-llvm-testsuite.yaml b/tcwg-llvm-testsuite.yaml index b7a53ccd22..e263c42f00 100644 --- a/tcwg-llvm-testsuite.yaml +++ b/tcwg-llvm-testsuite.yaml @@ -24,7 +24,7 @@ description: 'Flags to pass to the LNT nt producer (e.g. --threads=8 --cflag -O0)' - string: name: build_container_tag - default: 'xenial-tcwg-tested' + default: 'xenial' description: 'Type of image to use in the container: trusty, xenial.' - string: name: target_list diff --git a/tcwg-make-release.yaml b/tcwg-make-release.yaml index d1e8c48f98..16fbd05861 100644 --- a/tcwg-make-release.yaml +++ b/tcwg-make-release.yaml @@ -155,7 +155,7 @@ if [ x"$target" = x"aarch64-linux-gnu_ilp32" ]; then # ILP32 uses close-to-trunk Glibc branch, which needs # newer GNU make. - distro="xenial-tcwg-tested" + distro="xenial" else distro="default" fi diff --git a/tcwg-update-host-containers.yaml b/tcwg-update-host-containers.yaml index bf20a5395f..9a3a15354f 100644 --- a/tcwg-update-host-containers.yaml +++ b/tcwg-update-host-containers.yaml @@ -26,7 +26,7 @@ description: 'Machines to run on' - string: name: distro - default: 'xenial-tcwg-tested' + default: 'xenial' description: 'Distro version to use.' - bool: name: verbose @@ -58,7 +58,7 @@ - project-compare-type: 'PLAIN' project-pattern: 'ci/dockerfiles' branches: - - branch-pattern: 'tcwg-tested' + - branch-pattern: 'master' file-paths: - compare-type: ANT pattern: tcwg-base/home-data/** -- cgit v1.2.3