From: Kienan Stewart Date: Mon, 16 Oct 2023 14:49:02 +0000 (-0400) Subject: jjb/ansible: Drop support for Ubuntu bionic X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=8a4ac991c2ffb7eb730fb9585133a3012ca7ff73;p=lttng-ci.git jjb/ansible: Drop support for Ubuntu bionic Bionic reached it's end of life in June 2023 Change-Id: I1a874090a0360be7d962c1b78c2116716420745d Signed-off-by: Kienan Stewart --- diff --git a/automation/ansible/hosts b/automation/ansible/hosts index 8d90d53..6fedfcf 100644 --- a/automation/ansible/hosts +++ b/automation/ansible/hosts @@ -69,51 +69,6 @@ ci-node-deb12-i386-2c-01 ci-node-deb12-i386-2d-01 [node_amd64] -ci-node-bionic-amd64-02-01 -ci-node-bionic-amd64-02-02 -ci-node-bionic-amd64-02-03 -ci-node-bionic-amd64-02-04 -ci-node-bionic-amd64-02-05 -ci-node-bionic-amd64-02-06 -ci-node-bionic-amd64-02-07 -ci-node-bionic-amd64-02-08 -ci-node-bionic-amd64-02-09 -ci-node-bionic-amd64-02-10 - -ci-node-bionic-amd64-03-01 -ci-node-bionic-amd64-03-02 -ci-node-bionic-amd64-03-03 -ci-node-bionic-amd64-03-04 -ci-node-bionic-amd64-03-05 -ci-node-bionic-amd64-03-06 -ci-node-bionic-amd64-03-07 -ci-node-bionic-amd64-03-08 -ci-node-bionic-amd64-03-09 -ci-node-bionic-amd64-03-10 - -ci-node-bionic-amd64-05-01 -ci-node-bionic-amd64-05-02 -ci-node-bionic-amd64-05-03 -ci-node-bionic-amd64-05-04 -ci-node-bionic-amd64-05-04 -ci-node-bionic-amd64-05-05 -ci-node-bionic-amd64-05-06 -ci-node-bionic-amd64-05-07 -ci-node-bionic-amd64-05-08 -ci-node-bionic-amd64-05-09 -ci-node-bionic-amd64-05-10 - -ci-node-bionic-amd64-06-01 -ci-node-bionic-amd64-06-02 -ci-node-bionic-amd64-06-03 -ci-node-bionic-amd64-06-04 -ci-node-bionic-amd64-06-05 -ci-node-bionic-amd64-06-06 -ci-node-bionic-amd64-06-07 -ci-node-bionic-amd64-06-08 -ci-node-bionic-amd64-06-09 -ci-node-bionic-amd64-06-10 - ci-node-deb12-amd64-01 ci-node-deb12-amd64-02 ci-node-deb12-amd64-03 diff --git a/automation/ansible/playbooks/release-upgrade.yml b/automation/ansible/playbooks/release-upgrade.yml index d1c724b..a8d85b4 100644 --- a/automation/ansible/playbooks/release-upgrade.yml +++ b/automation/ansible/playbooks/release-upgrade.yml @@ -17,8 +17,6 @@ - bullseye - bookworm Ubuntu_releases: - - xenial - - bionic - focal - jammy - name: Run any outstanding upgrades diff --git a/automation/ansible/roles/compilers/vars/Ubuntu-18.yml b/automation/ansible/roles/compilers/vars/Ubuntu-18.yml deleted file mode 100644 index f88a27c..0000000 --- a/automation/ansible/roles/compilers/vars/Ubuntu-18.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -compilers_packages: - - gcc-4.8 - - gcc-5 - - gcc-6 - - gcc-7 - - gcc-8 - - g++-4.8 - - g++-5 - - g++-6 - - g++-7 - - g++-8 - - clang-3.9 - - clang-4.0 - - clang-5.0 - - clang-6.0 - - clang-7 diff --git a/automation/ansible/roles/cross-compilers/vars/Ubuntu-18.yml b/automation/ansible/roles/cross-compilers/vars/Ubuntu-18.yml deleted file mode 100644 index 2466f2d..0000000 --- a/automation/ansible/roles/cross-compilers/vars/Ubuntu-18.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -cross_compilers_packages: - - gcc-5-aarch64-linux-gnu - - gcc-5-arm-linux-gnueabihf - - gcc-5-i686-linux-gnu - - gcc-5-powerpc64le-linux-gnu - - gcc-5-powerpc-linux-gnu - - gcc-5-s390x-linux-gnu - - gcc-aarch64-linux-gnu - - gcc-arm-linux-gnueabihf - - gcc-i686-linux-gnu - - gcc-powerpc64le-linux-gnu - - gcc-powerpc-linux-gnu - - gcc-s390x-linux-gnu diff --git a/automation/ansible/roles/gitmirror/files/update.sh b/automation/ansible/roles/gitmirror/files/update.sh index dabb4af..9f87934 100644 --- a/automation/ansible/roles/gitmirror/files/update.sh +++ b/automation/ansible/roles/gitmirror/files/update.sh @@ -43,10 +43,6 @@ popd # Ubuntu kernels ## -update_git ubuntu-xenial.git/ https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/xenial - -update_git ubuntu-bionic.git/ git://kernel.ubuntu.com/ubuntu/ubuntu-bionic.git - update_git ubuntu-focal.git/ git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/focal update_git ubuntu-jammy.git/ git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/jammy diff --git a/automation/ansible/roles/lttng-modules/vars/Ubuntu-18.yml b/automation/ansible/roles/lttng-modules/vars/Ubuntu-18.yml deleted file mode 100644 index 4ba0692..0000000 --- a/automation/ansible/roles/lttng-modules/vars/Ubuntu-18.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -lttng_modules_packages: - - bc - - dctrl-tools - - dwarves - - gcc-4.8 - - gcc-5 - - kernel-wedge - - libelf-dev - - liblz4-tool - - module-init-tools - - s3cmd - - u-boot-tools - - zstd diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml index c8ee498..5df8cd1 100644 --- a/jobs/lttng-modules.yaml +++ b/jobs/lttng-modules.yaml @@ -786,7 +786,6 @@ - master - stable-2.13 uversion: - - bionic - focal - jammy buildtype: build @@ -799,7 +798,6 @@ mversion: - stable-2.12 uversion: - - bionic - focal - jammy buildtype: build @@ -842,7 +840,6 @@ - master - stable-2.13 uversion: - - bionic - focal - jammy buildtype: crossbuild @@ -855,7 +852,6 @@ mversion: - stable-2.12 uversion: - - bionic - focal - jammy buildtype: crossbuild diff --git a/scripts/lttng-modules/master.groovy b/scripts/lttng-modules/master.groovy index 6e39a54..95f6381 100644 --- a/scripts/lttng-modules/master.groovy +++ b/scripts/lttng-modules/master.groovy @@ -359,20 +359,6 @@ if (uversion != null) { ] break - case 'bionic': - matchStrs = [ - ~/^refs\/tags\/(Ubuntu-4\.15\.0-\d{1,3}?\.[\d]+)$/, - ~/^refs\/tags\/(Ubuntu-hwe-5\.4-5\.4\.0-.*_18\.04\.\d+)$/, - ] - break - - case 'xenial': - matchStrs = [ - ~/^refs\/tags\/(Ubuntu-4\.4\.0-\d{1,3}?\.[\d]+)$/, - ~/^refs\/tags\/(Ubuntu-hwe-4\.15\.0-.*_16\.04\.\d+)$/, - ] - break - default: println "Unsupported Ubuntu version: ${uversion}" throw new InterruptedException()