jjb: Run lttng-tools rootbuilds on deb12-amd64

Change-Id: I392c5a1c681a4f29a0846f1aac16d1cf60c500a0

diff --git a/automation/ansible/vars/ci-instances.yml b/automation/ansible/vars/ci-instances.yml
index cf5f5623d7b17aad762462177a4cb496e4fe6176..526457c20fdd38f97675d29b3f60c4ed7f1bc285 100644 (file)
--- a/automation/ansible/vars/ci-instances.yml
+++ b/automation/ansible/vars/ci-instances.yml
@@ -725,7 +725,7 @@ containers:
   #
   - jenkins:
       name: 'ci-rootnode-deb12-amd64-1a-01'
-      label: 'deb12 deb12-amd64-rootnode'
+      label: 'deb12 deb12-amd64-rootnode amd64-rootnode'
       mode: EXCLUSIVE
       config:
         remoteFS: '/root'
@@ -774,7 +774,7 @@ containers:
     meta:
       address: 172.18.17.2
   - jenkins:
-      label: 'deb12 deb12-amd64-rootnode'
+      label: 'deb12 deb12-amd64-rootnode amd64-rootnode'
       name: 'ci-rootnode-deb12-amd64-1b-01'
       mode: EXCLUSIVE
       config:
@@ -799,7 +799,7 @@ containers:
     meta:
       address: 172.18.17.3
   - jenkins:
-      label: 'deb12 deb12-amd64-rootnode'
+      label: 'deb12 deb12-amd64-rootnode amd64-rootnode'
       name: 'ci-rootnode-deb12-amd64-1c-01'
       mode: EXCLUSIVE
       config:
@@ -822,7 +822,7 @@ containers:
     meta:
       address: 172.18.17.4
   - jenkins:
-      label: 'deb12 deb12-amd64-rootnode'
+      label: 'deb12 deb12-amd64-rootnode amd64-rootnode'
       name: 'ci-rootnode-deb12-amd64-1d-01'
       config:
         remoteFS: '/root'
@@ -846,7 +846,7 @@ containers:
     meta:
       address: 172.18.17.5
   - jenkins:
-      label: 'deb12 deb12-amd64-rootnode'
+      label: 'deb12 deb12-amd64-rootnode amd64-rootnode'
       name: 'ci-rootnode-deb12-amd64-2a-01'
       mode: EXCLUSIVE
       config:
@@ -870,7 +870,7 @@ containers:
     meta:
       address: 172.18.17.6
   - jenkins:
-      label: 'deb12 deb12-amd64-rootnode'
+      label: 'deb12 deb12-amd64-rootnode amd64-rootnode'
       name: 'ci-rootnode-deb12-amd64-2b-01'
       mode: EXCLUSIVE
       config:
@@ -895,7 +895,7 @@ containers:
     meta:
       address: 172.18.17.7
   - jenkins:
-      label: 'deb12 deb12-amd64-rootnode'
+      label: 'deb12 deb12-amd64-rootnode amd64-rootnode'
       name: 'ci-rootnode-deb12-amd64-2c-01'
       mode: EXCLUSIVE
       config:
@@ -920,7 +920,7 @@ containers:
     meta:
       address: 172.18.17.8
   - jenkins:
-      label: 'deb12 deb12-amd64-rootnode'
+      label: 'deb12 deb12-amd64-rootnode amd64-rootnode'
       name: 'ci-rootnode-deb12-amd64-2d-01'
       mode: EXCLUSIVE
       config:

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index cf0eacb386ce2736721033ae844ca166f4fe573c..9175626cecd9a6bd03d57426e362e4fee37c9492 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -1157,12 +1157,12 @@
           buildtype: build
           version: master
           ustversion: master
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [master]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_rootbuild_i386':
           buildtype: portbuild
@@ -1287,12 +1287,12 @@
           buildtype: build
           version: stable-2.13
           ustversion: stable-2.13
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.13
@@ -1407,12 +1407,12 @@
           buildtype: build
           version: stable-2.12
           ustversion: stable-2.12
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.12
@@ -1708,12 +1708,12 @@
       - 'dev_review_lttng-tools_{version}_rootbuild':
           version: master
           buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
       - 'dev_review_lttng-tools_{version}_smokebuild':
           version: master
@@ -1762,12 +1762,12 @@
       - 'dev_review_lttng-tools_{version}_rootbuild':
           version: stable-2.13
           buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
 
     ## Stable 2.12 ##
@@ -1794,12 +1794,12 @@
       - 'dev_review_lttng-tools_{version}_rootbuild':
           version: stable-2.12
           buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
 
 - project:
@@ -1835,7 +1835,7 @@
           urcuversions: !!python/tuple [master]
           ustversion: master
           babelversions: !!python/tuple [master]
-          filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
 
 - project: