From 43eef6cbdc438450c8410fb032f3ee58f6a1aa0a Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Wed, 16 Aug 2023 13:29:02 -0400 Subject: [PATCH] ansible/jjb: Run lttng-tools 2.12 rootbuild on nodes with linux 5.x The Debian 12 nodes run with Linux 6.1, which is not supported by lttng-modules stable-2.12. Since the lttng-tools rootbuild jobs build and test the modules component, those jobs failed. A new libvirt instance was provisioned and both linux-image-amd64 and linux-headers-amd64 installed from Debian bullseye and set to held so there an instance with an appropriately versioned kernel to exercise the lttng-tools rootbuild with lttng-modules tests. Change-Id: Ie9234880b2785c5fa8d03dd7297fcc0d926b183c --- automation/ansible/hosts | 1 + automation/ansible/vars/ci-instances.yml | 25 ++++++++++++++++++++++++ jobs/lttng-tools.yaml | 4 ++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/automation/ansible/hosts b/automation/ansible/hosts index a16ca81..cbd47cc 100644 --- a/automation/ansible/hosts +++ b/automation/ansible/hosts @@ -217,6 +217,7 @@ ci-node-deb12-amd64-2c-10 ci-rootnode-deb12-amd64-1a-01 ci-rootnode-deb12-amd64-1b-01 ci-rootnode-deb12-amd64-1c-01 +ci-rootnode-deb12-amd64-1c-02 ci-rootnode-deb12-amd64-1d-01 ci-rootnode-deb12-amd64-2a-01 ci-rootnode-deb12-amd64-2b-01 diff --git a/automation/ansible/vars/ci-instances.yml b/automation/ansible/vars/ci-instances.yml index 29fe3a2..e36f19d 100644 --- a/automation/ansible/vars/ci-instances.yml +++ b/automation/ansible/vars/ci-instances.yml @@ -944,3 +944,28 @@ containers: host: 'ci-host-amd64-2d.internal.efficios.com' meta: address: 172.18.17.9 + - jenkins: + label: 'deb12 deb12-amd64-rootnode amd64-rootnode-linux5' + name: 'ci-rootnode-deb12-amd64-1c-02' + mode: EXCLUSIVE + config: + remoteFS: '/root' + launcher/hypervisorDescription: 'QEMU+ssh - ci-host-amd64-1c.internal.efficios.com' + launcher/virtualMachineName: 'ci-rootnode-deb12-amd64-1c-02' + launcher/delegate: 'hudson.plugins.sshslaves.SSHLauncher=class' + launcher/delegate/port: '22' + launcher/delegate/host: 'ci-rootnode-deb12-amd64-1c-02.internal.efficios.com' + launcher/delegate/credentialsId: 'bb5a81cf-346b-43fc-8586-3dc5e43801be' + ./hypervisorDescription: 'QEMU+ssh - ci-host-amd64-1c.internal.efficios.com' + ./virtualMachineName: 'ci-rootnode-deb12-amd64-1c-02' + snapshotName: '' + beforeJobSnapshotName: 'base-configuration' + startupWaitingPeriodSeconds: '20' + launcher/waitTimeMs: '20000' + shutdownMethod: 'destroy' + vm: + name: 'ci-rootnode-deb12-amd64-1c-02' + disk: '/var/lib/libvirt/images/ci-rootnode-deb12-amd64-1c-02.qcow' + host: 'ci-host-amd64-1c.internal.efficios.com' + meta: + address: 172.18.17.10 diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 5c97d73..4b656a3 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -1417,7 +1417,7 @@ confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")' + filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")' touchstone: '' - 'lttng-tools_{version}_release': version: v2.12 @@ -1804,7 +1804,7 @@ confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")' + filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")' touchstone: '' - project: -- 2.34.1