diff options
-rwxr-xr-x | tcwg-abe-extended/builders.sh | 4 | ||||
-rw-r--r-- | tcwg-abe-test.yaml | 4 | ||||
-rw-r--r-- | tcwg-binutils.yaml | 2 | ||||
-rw-r--r-- | tcwg-buildapp-christophe.yaml | 2 | ||||
-rw-r--r-- | tcwg-buildapp.yaml | 2 | ||||
-rw-r--r-- | tcwg-buildfarm-maxim.yaml | 2 | ||||
-rw-r--r-- | tcwg-buildfarm.yaml | 4 | ||||
-rw-r--r-- | tcwg-gcc-bisect.yaml | 2 | ||||
-rw-r--r-- | tcwg-gnu-patch-benchmarking.yaml | 2 | ||||
-rw-r--r-- | tcwg-llvm-release.yaml | 2 | ||||
-rw-r--r-- | tcwg-llvm-staged-build.yaml | 2 | ||||
-rw-r--r-- | tcwg-llvm-testsuite-diana.yaml | 2 | ||||
-rw-r--r-- | tcwg-llvm-testsuite.yaml | 2 | ||||
-rw-r--r-- | tcwg-make-release.yaml | 4 | ||||
-rw-r--r-- | tcwg-make-source-tarball.yaml | 2 | ||||
-rw-r--r-- | tcwg-test-release-matrix.yaml | 2 | ||||
-rw-r--r-- | tcwg-test-release.yaml | 2 | ||||
-rw-r--r-- | tcwg-validate-abetests.yaml | 2 |
18 files changed, 21 insertions, 23 deletions
diff --git a/tcwg-abe-extended/builders.sh b/tcwg-abe-extended/builders.sh index 97b06a56c2..07b5405d39 100755 --- a/tcwg-abe-extended/builders.sh +++ b/tcwg-abe-extended/builders.sh @@ -4,7 +4,7 @@ set -ex . ./jenkins-scripts/jenkins-helpers.sh -./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh +./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --task build --prefix build_ > build-container.sh . ./build-container.sh trap "build_container_cleanup" EXIT HUP INT QUIT TRAP PIPE TERM BUILD_SHELL="build_container_exec bash" @@ -54,7 +54,7 @@ case "$testname" in cross_linux_*) target=arm-linux-gnueabihf tester_label=$(print_tester_label_for_target $target) - bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro trusty --task test --prefix test_ > test-container.sh + bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --task test --prefix test_ > test-container.sh . ./test-container.sh trap "build_container_cleanup; test_container_cleanup" EXIT HUP INT QUIT TRAP PIPE TERM testcontainer_opt="--testcontainer ${test_container_host}:${test_container_port}" diff --git a/tcwg-abe-test.yaml b/tcwg-abe-test.yaml index 807b5326d0..07ff7c40a0 100644 --- a/tcwg-abe-test.yaml +++ b/tcwg-abe-test.yaml @@ -102,7 +102,7 @@ git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts . ./jenkins-scripts/jenkins-helpers.sh - ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh + ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --task build --prefix build_ > build-container.sh . ./build-container.sh BUILD_SHELL="build_container_exec bash" $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a" @@ -115,7 +115,7 @@ case "$test" in cross_build) tester_label=$(print_tester_label_for_target arm-linux-gnueabihf) - ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro trusty --task test --prefix test_ > test-container.sh + ./jenkins-scripts/start-container-docker.sh --label $tester_label --task test --prefix test_ > test-container.sh . ./test-container.sh trap "build_container_cleanup; test_container_cleanup" EXIT HUP INT QUIT TRAP KILL PIPE TERM diff --git a/tcwg-binutils.yaml b/tcwg-binutils.yaml index 1b04698368..162188e703 100644 --- a/tcwg-binutils.yaml +++ b/tcwg-binutils.yaml @@ -100,7 +100,7 @@ rm -rf jenkins-scripts git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts - ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh + ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --task build --prefix build_ > build-container.sh . ./build-container.sh BUILD_SHELL="build_container_exec bash" $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a" diff --git a/tcwg-buildapp-christophe.yaml b/tcwg-buildapp-christophe.yaml index 2d3f7c7443..4dce04e6f5 100644 --- a/tcwg-buildapp-christophe.yaml +++ b/tcwg-buildapp-christophe.yaml @@ -44,7 +44,7 @@ description: 'Jenkins-scripts branch to use' - string: name: build_container_tag - default: 'trusty' + default: 'trusty-tcwg-tested' description: 'Distro to use on the builder with non-default container type: trusty, xenial.' - string: name: LAVA_SERVER diff --git a/tcwg-buildapp.yaml b/tcwg-buildapp.yaml index c21e92cd1b..86b3978289 100644 --- a/tcwg-buildapp.yaml +++ b/tcwg-buildapp.yaml @@ -44,7 +44,7 @@ description: 'Jenkins-scripts branch to use' - string: name: build_container_tag - default: 'trusty' + default: 'trusty-tcwg-tested' description: 'Distro to use on the builder with non-default container type: trusty, xenial.' - string: name: LAVA_SERVER diff --git a/tcwg-buildfarm-maxim.yaml b/tcwg-buildfarm-maxim.yaml index df2d3947c1..1179ac3f83 100644 --- a/tcwg-buildfarm-maxim.yaml +++ b/tcwg-buildfarm-maxim.yaml @@ -84,7 +84,7 @@ description: 'Scripts branch to use' - string: name: build_container_tag - default: 'trusty' + default: 'trusty-tcwg-tested' description: 'Distro to use on the builder with non-default container type: trusty, xenial.' - string: name: displaytag diff --git a/tcwg-buildfarm.yaml b/tcwg-buildfarm.yaml index 0b7c76eaf6..e614f0f2b4 100644 --- a/tcwg-buildfarm.yaml +++ b/tcwg-buildfarm.yaml @@ -80,11 +80,11 @@ description: 'Scripts branch to use' - string: name: build_container_tag - default: 'trusty' + default: 'trusty-tcwg-tested' description: 'Distro to use on the builder with non-default container type: trusty, xenial.' - string: name: test_container_tag - default: 'trusty' + default: 'trusty-tcwg-tested' description: 'Distro to use in the test container: trusty, xenial.' - string: name: displaytag diff --git a/tcwg-gcc-bisect.yaml b/tcwg-gcc-bisect.yaml index 7388bf215e..5c720c64ab 100644 --- a/tcwg-gcc-bisect.yaml +++ b/tcwg-gcc-bisect.yaml @@ -48,7 +48,7 @@ description: 'Bad SVN revision' - string: name: build_container_tag - default: 'xenial' + default: 'xenial-tcwg-tested' description: 'Distro to use on the builder: trusty, xenial.' disabled: false node: tcwg-x86_64-cam diff --git a/tcwg-gnu-patch-benchmarking.yaml b/tcwg-gnu-patch-benchmarking.yaml index bdb96ac1f8..ef431d9206 100644 --- a/tcwg-gnu-patch-benchmarking.yaml +++ b/tcwg-gnu-patch-benchmarking.yaml @@ -54,7 +54,7 @@ rebuild=true dont_fail=false log_server=dev-01.tcwglab:logs - build_container_tag=trusty + build_container_tag=trusty-tcwg-tested binaries=true description: 'Buildfarm parameters, see tcwg-buildfarm job' - text: diff --git a/tcwg-llvm-release.yaml b/tcwg-llvm-release.yaml index c696c6be70..8e970f0892 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: 'xenial' + default: 'xenial-tcwg-tested' 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 c0ec466488..2143207c6a 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' + default: 'xenial-tcwg-tested' description: 'Type of image to use in the container: trusty, xenial.' - bool: name: twostage diff --git a/tcwg-llvm-testsuite-diana.yaml b/tcwg-llvm-testsuite-diana.yaml index 0901e872aa..b278982533 100644 --- a/tcwg-llvm-testsuite-diana.yaml +++ b/tcwg-llvm-testsuite-diana.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' + default: 'xenial-tcwg-tested' description: 'Type of image to use in the container: trusty, xenial.' - string: name: target_list diff --git a/tcwg-llvm-testsuite.yaml b/tcwg-llvm-testsuite.yaml index 0bcdcaae72..501e9d74c4 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' + default: 'xenial-tcwg-tested' 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 c160b00d2d..f230db27df 100644 --- a/tcwg-make-release.yaml +++ b/tcwg-make-release.yaml @@ -147,10 +147,8 @@ . jenkins-scripts/jenkins-helpers.sh # Start build container - build_container_type=docker - build_container_distro=trusty builder=$(print_host_for_node $NODE_NAME) - bash -x ./jenkins-scripts/start-container-${build_container_type}.sh --arch ${builder_arch} --distro ${build_container_distro} --session-host ${builder} > build-container.sh + bash -x ./jenkins-scripts/start-container-docker.sh --arch ${builder_arch} --session-host ${builder} > build-container.sh # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port . ./build-container.sh diff --git a/tcwg-make-source-tarball.yaml b/tcwg-make-source-tarball.yaml index 7d951e339b..d05539b371 100644 --- a/tcwg-make-source-tarball.yaml +++ b/tcwg-make-source-tarball.yaml @@ -72,7 +72,7 @@ # Start build container host=$(print_host_for_node $NODE_NAME) - bash ${WORKSPACE}/jenkins-scripts/start-container-docker.sh --arch amd64 --distro trusty --session-host ${host} > build-container.sh + bash ${WORKSPACE}/jenkins-scripts/start-container-docker.sh --arch amd64 --session-host ${host} > build-container.sh # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port . ./build-container.sh diff --git a/tcwg-test-release-matrix.yaml b/tcwg-test-release-matrix.yaml index d28fd0dbfc..7c4694527b 100644 --- a/tcwg-test-release-matrix.yaml +++ b/tcwg-test-release-matrix.yaml @@ -24,7 +24,7 @@ description: 'Scripts revision to use ' - string: name: build_container_tag - default: 'trusty' + default: 'trusty-tcwg-tested' description: 'Distro to use for the container: trusty, xenial.' - string: name: release diff --git a/tcwg-test-release.yaml b/tcwg-test-release.yaml index 5510fb1fbf..946717e034 100644 --- a/tcwg-test-release.yaml +++ b/tcwg-test-release.yaml @@ -24,7 +24,7 @@ description: 'Scripts revision to use ' - string: name: build_container_tag - default: 'trusty' + default: 'trusty-tcwg-tested' description: 'Distro to use for the container: trusty, xenial.' - string: name: release diff --git a/tcwg-validate-abetests.yaml b/tcwg-validate-abetests.yaml index 281d2a3742..942652bf92 100644 --- a/tcwg-validate-abetests.yaml +++ b/tcwg-validate-abetests.yaml @@ -84,7 +84,7 @@ git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts - ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh + ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --task build --prefix build_ > build-container.sh . ./build-container.sh BUILD_SHELL="build_container_exec bash" $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a" |