diff options
31 files changed, 56 insertions, 56 deletions
diff --git a/tcwg-abe-tested.yaml b/tcwg-abe-tested.yaml index 70c65f7023..66949980d3 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: 'bionic' + default: 'lts_1' description: 'Distro image to use' disabled: false node: tcwg-coordinator @@ -114,7 +114,7 @@ predefined-parameters: | abe_branch=$GIT_COMMIT scripts_branch=$GIT_COMMIT_1 - distro=bionic + distro=lts_1 - shell: | #!/bin/bash diff --git a/tcwg-binutils.yaml b/tcwg-binutils.yaml index 4c2ea6ad82..87c6099461 100644 --- a/tcwg-binutils.yaml +++ b/tcwg-binutils.yaml @@ -44,7 +44,7 @@ description: 'Log_Server' - string: name: build_container_distro - default: 'bionic' + default: 'lts_1' description: 'Distro to use on the builder with non-default container type: xenial, bionic, focal ...' disabled: false node: tcwg-x86_64-dev-02 diff --git a/tcwg-buildapp.yaml b/tcwg-buildapp.yaml index 94c0f7f875..ab47f5f497 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: 'default' + default: 'lts_1' description: 'Distro to use on the builder with non-default container type: xenial, bionic, focal.' - string: name: LAVA_SERVER diff --git a/tcwg-buildfarm-cmp.yaml b/tcwg-buildfarm-cmp.yaml index 6d19054d25..e0bc437ff2 100644 --- a/tcwg-buildfarm-cmp.yaml +++ b/tcwg-buildfarm-cmp.yaml @@ -56,7 +56,7 @@ description: 'jenkins-scripts revision to use for evaluation builds' - string: name: eval_distro - default: 'bionic' + default: 'lts_1' description: 'Distro image to use in reference builds.' - bool: name: eval_rebuild diff --git a/tcwg-buildfarm.yaml b/tcwg-buildfarm.yaml index 93c690a67c..23e1a4b4a7 100644 --- a/tcwg-buildfarm.yaml +++ b/tcwg-buildfarm.yaml @@ -80,11 +80,11 @@ description: 'Scripts branch to use' - string: name: build_container_tag - default: 'bionic' + default: 'lts_1' description: 'Distro to use on the builder with non-default container type: xenial, bionic, focal.' - string: name: test_container_tag - default: 'bionic' + default: 'lts_1' description: 'Distro to use in the test container: xenial, bionic, focal.' - string: name: displaytag diff --git a/tcwg-dev-build-christophe.yaml b/tcwg-dev-build-christophe.yaml index 1fe517a083..26c929a9ec 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: bionic + default: lts_1 description: 'Distro to use on the builder with non-default container type: xenial, bionic, focal.' disabled: false node: tcwg-x86_64-build diff --git a/tcwg-dev-build.yaml b/tcwg-dev-build.yaml index ffcf64d299..a3820329fe 100644 --- a/tcwg-dev-build.yaml +++ b/tcwg-dev-build.yaml @@ -54,8 +54,8 @@ - choice: name: distro choices: - - bionic - - focal + - lts_1 + - lts description: 'Ubuntu distro to use for build environment' - label: name: builder diff --git a/tcwg-gcc-bisect.yaml b/tcwg-gcc-bisect.yaml index 3ab3b8cb88..14d6ce2ec4 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: 'bionic' + default: 'lts_1' description: 'Distro to use on the builder: xenial, bionic, focal.' disabled: false node: tcwg-x86_64-cam diff --git a/tcwg-gnu-builds.yaml b/tcwg-gnu-builds.yaml index 8c46018468..ee9d8dc754 100644 --- a/tcwg-gnu-builds.yaml +++ b/tcwg-gnu-builds.yaml @@ -72,8 +72,8 @@ - choice: name: distro choices: - - bionic - - focal + - lts_1 + - lts description: 'Ubuntu distro to use for build environment' - bool: name: publish @@ -117,7 +117,7 @@ # There's still no arm32v7/ubuntu:focal docker image, so # force using bionic for armhf for now. cp build-params.txt build-params-armv7.txt - sed -i -e "s/^distro=focal\$/distro=bionic/" build-params-armv7.txt + sed -i -e "s/^distro=lts\$/distro=lts_1/" build-params-armv7.txt - multijob: name: Build projects: @@ -320,10 +320,10 @@ property-file: build-params.txt predefined-parameters: | version=latest-rel - distro=bionic + distro=lts_1 - project: tcwg-gnu-builds property-file: build-params.txt predefined-parameters: | version=master - distro=focal -# checksum: 8c8a82a61abb232d08ef79ea961811cd + distro=lts +# checksum: 6e5e88d8cc3b4a13ae9b7bcbaf7c844e diff --git a/tcwg-gnu-builds.yaml.in b/tcwg-gnu-builds.yaml.in index 83fef03249..2fd309b7fd 100644 --- a/tcwg-gnu-builds.yaml.in +++ b/tcwg-gnu-builds.yaml.in @@ -39,8 +39,8 @@ - choice: name: distro choices: - - bionic - - focal + - lts_1 + - lts description: 'Ubuntu distro to use for build environment' - bool: name: publish @@ -84,7 +84,7 @@ # There's still no arm32v7/ubuntu:focal docker image, so # force using bionic for armhf for now. cp build-params.txt build-params-armv7.txt - sed -i -e "s/^distro=focal\$/distro=bionic/" build-params-armv7.txt + sed -i -e "s/^distro=lts\$/distro=lts_1/" build-params-armv7.txt - multijob: name: Build projects: @@ -287,9 +287,9 @@ property-file: build-params.txt predefined-parameters: | version=latest-rel - distro=bionic + distro=lts_1 - project: tcwg-gnu-builds property-file: build-params.txt predefined-parameters: | version=master - distro=focal + distro=lts diff --git a/tcwg-llvm-release.yaml b/tcwg-llvm-release.yaml index bba2def9c4..a70e5e995c 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' + default: 'lts_1' description: 'Type of image to use in the container: xenial, bionic, focal.' - string: name: compiler diff --git a/tcwg-regression-detection.yaml b/tcwg-regression-detection.yaml index 8bc96f1ccb..06b9ae5d82 100644 --- a/tcwg-regression-detection.yaml +++ b/tcwg-regression-detection.yaml @@ -197,7 +197,7 @@ cat << EOF > llvm_release_parameters release=7.0.0 candidate=final - build_container_tag=bionic + build_container_tag=lts_1 EOF fi - multijob: diff --git a/tcwg-shell-scripts-sanity-check.yaml b/tcwg-shell-scripts-sanity-check.yaml index bf3b8298cd..ebda7b8779 100644 --- a/tcwg-shell-scripts-sanity-check.yaml +++ b/tcwg-shell-scripts-sanity-check.yaml @@ -62,7 +62,7 @@ # the CWD, so run from inside the folder. # GERRIT_PROJECT is for example toolchain/jenkins-scripts cd ${GERRIT_PROJECT} - ../../jenkins-scripts-master/docker-run.sh --distro focal -- ../../jenkins-scripts-master/sanity-check.sh + ../../jenkins-scripts-master/docker-run.sh --distro lts -- ../../jenkins-scripts-master/sanity-check.sh # Aka some files had issues # Any other non-zero means we called shellcheck incorrectly unstable-return: 1 diff --git a/tcwg-test-release-matrix.yaml b/tcwg-test-release-matrix.yaml index 88f321b3b2..314d2318b9 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: 'default' + default: 'lts_1' description: 'Distro to use for the container: xenial, bionic, focal.' - string: name: release diff --git a/tcwg-test-release.yaml b/tcwg-test-release.yaml index 03d4345fdc..3235887444 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: 'default' + default: 'lts_1' description: 'Distro to use for the container: xenial, bionic, focal.' - string: name: release diff --git a/tcwg-update-host-containers.yaml b/tcwg-update-host-containers.yaml index 5649c38699..632150b691 100644 --- a/tcwg-update-host-containers.yaml +++ b/tcwg-update-host-containers.yaml @@ -27,7 +27,7 @@ description: 'Machines to run on' - string: name: distro - default: 'bionic' + default: 'lts_1' description: 'Distro version to use.' - bool: name: force @@ -82,4 +82,4 @@ --group "$group" \ --force "$force" \ --verbose "$verbose" -# checksum: c16940f627f763e520f2076087fda7d4 +# checksum: a4118bbae856c04f0313ad0448b1829f diff --git a/tcwg-update-jenkins-containers.yaml b/tcwg-update-jenkins-containers.yaml index 842e8647f9..bbd9fdc2a5 100644 --- a/tcwg-update-jenkins-containers.yaml +++ b/tcwg-update-jenkins-containers.yaml @@ -31,7 +31,7 @@ description: 'Machines to run on' - string: name: distro - default: 'bionic' + default: 'lts_1' description: 'Distro version to use.' - bool: name: force @@ -83,4 +83,4 @@ --force "$force" \ --verbose "$verbose" || exit 125 unstable-return: 125 -# checksum: 0de9048a2b3af565d4edbc157c89d480 +# checksum: 4860cc3355321347ae1e5b1bbfdf0d90 diff --git a/tcwg-update-llvmbot-containers.yaml b/tcwg-update-llvmbot-containers.yaml index 07d8f4b945..7926443463 100644 --- a/tcwg-update-llvmbot-containers.yaml +++ b/tcwg-update-llvmbot-containers.yaml @@ -27,7 +27,7 @@ description: 'Machines to run on' - string: name: distro - default: 'bionic' + default: 'lts_1' description: 'Distro version to use.' - string: name: master @@ -88,4 +88,4 @@ --password "$TCWG_LLVMBOT_PASSWORD" \ --force "$force" \ --verbose "$verbose" -# checksum: 343297d84943e8102574bde869f2e8ab +# checksum: 6766d5ce803e66e05e51e54bbcc3b658 diff --git a/tcwg-update.yaml.in b/tcwg-update.yaml.in index e6e178c1cd..61b458640a 100644 --- a/tcwg-update.yaml.in +++ b/tcwg-update.yaml.in @@ -36,7 +36,7 @@ description: 'Machines to run on' - string: name: distro - default: 'bionic' + default: 'lts_1' description: 'Distro version to use.' #if CONTAINER_llvmbot - string: diff --git a/tcwg-upstream-monitoring.yaml b/tcwg-upstream-monitoring.yaml index b8fc5cec34..1fbcfdb6cc 100644 --- a/tcwg-upstream-monitoring.yaml +++ b/tcwg-upstream-monitoring.yaml @@ -118,7 +118,7 @@ log_server=$log_server abe_branch=tested scripts_branch=tested - build_container_tag=bionic + build_container_tag=lts_1 displaytag=upstream-monitoring-$branch-gcc-r${svnrev_gcc=}-${BUILD_NUMBER} send_results_to=gcc-testresults@gcc.gnu.org EOF diff --git a/tcwg/round-robin.yaml.inc b/tcwg/round-robin.yaml.inc index 6c24c3d86d..5008c65693 100644 --- a/tcwg/round-robin.yaml.inc +++ b/tcwg/round-robin.yaml.inc @@ -23,7 +23,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch diff --git a/tcwg_binutils.yaml b/tcwg_binutils.yaml index e5658eda6e..9c57c2617a 100644 --- a/tcwg_binutils.yaml +++ b/tcwg_binutils.yaml @@ -86,7 +86,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -461,4 +461,4 @@ docker_arch: '{docker_arch}' publishers: - bisect-publishers -# checksum: 89b2a0da833191dae94ba5fdfd79edf1 +# checksum: 76d05e23ec51fc8fe019e2a0964a18df diff --git a/tcwg_bmk_ci_gnu.yaml b/tcwg_bmk_ci_gnu.yaml index 4a37374e75..f03335785d 100644 --- a/tcwg_bmk_ci_gnu.yaml +++ b/tcwg_bmk_ci_gnu.yaml @@ -128,7 +128,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -542,4 +542,4 @@ ci_project_config: 'tcwg_bmk_{hw}-gnu-{toolchain_ver}-{target}-{bmk}-{cflags}' publishers: - bisect-publishers -# checksum: 88b54507c22c9fb008238bd53e65cc4f +# checksum: 4a1da344a6a48e6c3559cd33b53b190d diff --git a/tcwg_bmk_ci_gnu_eabi.yaml b/tcwg_bmk_ci_gnu_eabi.yaml index 2c23495fff..e5ad4f22f7 100644 --- a/tcwg_bmk_ci_gnu_eabi.yaml +++ b/tcwg_bmk_ci_gnu_eabi.yaml @@ -125,7 +125,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -539,4 +539,4 @@ ci_project_config: 'tcwg_bmk_{hw}-gnu_eabi-{toolchain_ver}-{target}-{bmk}-{cflags}' publishers: - bisect-publishers -# checksum: 4cc5feefde798388fe964c03e518913a +# checksum: fab21c4a3d627994ab1dff81cb675ae8 diff --git a/tcwg_bmk_ci_llvm.yaml b/tcwg_bmk_ci_llvm.yaml index 89a5b68c0c..2fea0e6ede 100644 --- a/tcwg_bmk_ci_llvm.yaml +++ b/tcwg_bmk_ci_llvm.yaml @@ -131,7 +131,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -557,4 +557,4 @@ ci_project_config: 'tcwg_bmk_{hw}-llvm-{toolchain_ver}-{target}-{bmk}-{cflags}' publishers: - bisect-publishers -# checksum: 7509ae32d15810b6b411098c17306010 +# checksum: 3ab5b7c8a98a57cfcd8adb80c14257c4 diff --git a/tcwg_bmk_dev_gnu.yaml b/tcwg_bmk_dev_gnu.yaml index 4a4c9539e6..12f96bae3e 100644 --- a/tcwg_bmk_dev_gnu.yaml +++ b/tcwg_bmk_dev_gnu.yaml @@ -56,7 +56,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -450,4 +450,4 @@ ci_project_config: 'tcwg_bmk_{hw}' publishers: - bisect-publishers -# checksum: 9f8116be5a3877abf8d365d254a77e24 +# checksum: 507031ef63f53d18f8e841d61f6c2b41 diff --git a/tcwg_bmk_dev_llvm.yaml b/tcwg_bmk_dev_llvm.yaml index 28f734ed0c..dea6b4e553 100644 --- a/tcwg_bmk_dev_llvm.yaml +++ b/tcwg_bmk_dev_llvm.yaml @@ -56,7 +56,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -455,4 +455,4 @@ ci_project_config: 'tcwg_bmk_{hw}' publishers: - bisect-publishers -# checksum: 9de3bc6e389dad31850229d19a0f82f2 +# checksum: e019b065984607118188a3bd24961e7f diff --git a/tcwg_cross.yaml b/tcwg_cross.yaml index 7f3d394001..3cb5ab049c 100644 --- a/tcwg_cross.yaml +++ b/tcwg_cross.yaml @@ -94,7 +94,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -498,4 +498,4 @@ ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{type_of_test}' publishers: - bisect-publishers -# checksum: 25d78be1d50e43c6226ffcec3a0cdc19 +# checksum: 38c4823353c0fc4cbf6b036b20bda57d diff --git a/tcwg_gcc.yaml b/tcwg_gcc.yaml index f71adbd64f..0746f5660a 100644 --- a/tcwg_gcc.yaml +++ b/tcwg_gcc.yaml @@ -96,7 +96,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -487,4 +487,4 @@ docker_arch: '{docker_arch}' publishers: - bisect-publishers -# checksum: 3ba92843c792f17ce1ae68ced28227ae +# checksum: 2b0ca9160f17a22d1019ba685581e6db diff --git a/tcwg_kernel-gnu.yaml b/tcwg_kernel-gnu.yaml index 723ffbed17..2f17630736 100644 --- a/tcwg_kernel-gnu.yaml +++ b/tcwg_kernel-gnu.yaml @@ -103,7 +103,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -501,4 +501,4 @@ ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}' publishers: - bisect-publishers -# checksum: 1a4fd9a57bce8470ca76937e1a48c89c +# checksum: 9fa2c4953788a231db44bb6e8a2dec7e diff --git a/tcwg_kernel-llvm.yaml b/tcwg_kernel-llvm.yaml index 5878e90632..0d028afca4 100644 --- a/tcwg_kernel-llvm.yaml +++ b/tcwg_kernel-llvm.yaml @@ -103,7 +103,7 @@ description: "Comma-separated list of email recipients; use 'default' unless testing" - string: name: distro - default: bionic + default: lts_1 description: 'Distro image to use' - string: name: scripts_branch @@ -501,4 +501,4 @@ ci_project_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}' publishers: - bisect-publishers -# checksum: db80d9696f33da86bdc129cf9516c907 +# checksum: d1fc06f45f6299ca02e2ce5620f3db2c |