jjb: update dev_upstream jobs

Change-Id: Iec9a1a1dfffefea2dfd326a60a58481bc11f39e5
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index e690914dce95bd0e77868e65f4050fa72ac52fdd..ae5dad75904a31e282f57e4e6680440aa466e405 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -1235,10 +1235,10 @@
     jobs:
       # stable-2.11
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
+          buildtype: linuxbuild
           version: stable-2.11
           ustversion: stable-2.11
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [jammy-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1262,7 +1262,7 @@
           buildtype: slesbuild
           version: stable-2.11
           ustversion: stable-2.11
-          platforms: !!python/tuple [sles12sp5-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1282,37 +1282,13 @@
           testtypes: !!python/tuple [base]
           filter: ''
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_long_regression':
-          buildtype: build
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          testtypes: !!python/tuple [full]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_rootbuild':
-          buildtype: build
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          testtypes: !!python/tuple [base]
-          filter: ''
-          touchstone: ''
 
       # stable-2.10
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
+          buildtype: linuxbuild
           version: stable-2.10
           ustversion: stable-2.10
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [jammy-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1336,7 +1312,7 @@
           buildtype: slesbuild
           version: stable-2.10
           ustversion: stable-2.10
-          platforms: !!python/tuple [sles12sp5-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1356,18 +1332,6 @@
           testtypes: !!python/tuple [base]
           filter: ''
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_long_regression':
-          buildtype: build
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          testtypes: !!python/tuple [full]
-          filter: ''
-          touchstone: ''
 
 - project:
     name: dev_jgalar_lttng-tools

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index cde5ae8bce1f7a78d9dbd17edfc3b0c128946096..cbc2054fc0a73e8907f77bea53f75dd956ec17ca 100644 (file)
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -679,9 +679,9 @@
     jobs:
       ## Stable 2.11 ##
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: build
+          buildtype: linuxbuild
           version: stable-2.11
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [jammy-amd64]
           builds: !!python/tuple [std, dist, oot, oot-dist]
           confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
           liburcu_versions: !!python/tuple [stable-0.11]
@@ -699,7 +699,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.11
-          platforms: !!python/tuple [sles12sp5-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.11]
@@ -717,9 +717,9 @@
 
       ## Stable 2.10 ##
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
-          buildtype: build
+          buildtype: linuxbuild
           version: stable-2.10
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [jammy-amd64]
           builds: !!python/tuple [std, dist, oot, oot-dist]
           confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
           liburcu_versions: !!python/tuple [stable-0.9]
@@ -737,7 +737,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.10
-          platforms: !!python/tuple [sles12sp5-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.9]