From 30e5c12c8d51c154a3a4c445204152a4231c00de Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 8 Aug 2023 11:22:24 -0400 Subject: [PATCH] jjb: Remove 'jammy-amd64' platform from all jobs The new default platform will be based on Debian 12 (Bookworm), remove the Ubuntu Jammy platform that was previously in testing. Change-Id: Ia01cafac13925b8a593d201f5cc1384dd0c8a735 Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 8 ++++---- jobs/barectf.yaml | 4 ++-- jobs/binutils-gdb.yaml | 4 ++-- jobs/librseq.yaml | 8 ++++---- jobs/liburcu.yaml | 4 ++-- jobs/lttng-analyses.yaml | 6 +++--- jobs/lttng-tools.yaml | 16 ++++++++-------- jobs/lttng-ust.yaml | 10 +++++----- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index de1aa1d..7a663ba 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -436,7 +436,7 @@ triggers: - gerrit: *babeltrace_trigger_gerrit_smoke - node: 'jammy-amd64' + node: 'deb12-amd64' builders: - shell: @@ -587,7 +587,7 @@ jobs: - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist, oot-dist] confs: !!python/tuple [std, static, prod, min, doc, asan] filter: '(build=="std") || (conf=="std") || (conf=="doc")' @@ -752,7 +752,7 @@ ## ALL ## - 'dev_review_babeltrace_{version}_smokebuild': - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [oot-dist] confs: !!python/tuple [std] filter: '' @@ -772,7 +772,7 @@ jobs: - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist, oot-dist] confs: !!python/tuple [std, static, python-bindings] filter: '' diff --git a/jobs/barectf.yaml b/jobs/barectf.yaml index da18362..160bf38 100644 --- a/jobs/barectf.yaml +++ b/jobs/barectf.yaml @@ -167,7 +167,7 @@ jobs: - 'barectf_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] - project: name: review-barectf @@ -180,7 +180,7 @@ jobs: - 'dev_review_barectf_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] - project: name: barectf-views diff --git a/jobs/binutils-gdb.yaml b/jobs/binutils-gdb.yaml index 9f98111..28fcf9b 100644 --- a/jobs/binutils-gdb.yaml +++ b/jobs/binutils-gdb.yaml @@ -162,7 +162,7 @@ - master jobs: - 'binutils-gdb_{version}_linuxbuild': - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] target_boards: !!python/tuple ["unix", "native-gdbserver", "native-extended-gdbserver"] - 'binutils-gdb_{version}_macosbuild': platforms: !!python/tuple [macos-amd64, macos-arm64] @@ -172,7 +172,7 @@ name: review-gdb jobs: - 'dev_review_binutils-gdb_linuxbuild': - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] target_boards: !!python/tuple ["unix", "native-gdbserver", "native-extended-gdbserver"] - project: diff --git a/jobs/librseq.yaml b/jobs/librseq.yaml index 2bfff94..15e5c7d 100644 --- a/jobs/librseq.yaml +++ b/jobs/librseq.yaml @@ -320,20 +320,20 @@ jobs: - 'librseq_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist, oot-dist] confs: !!python/tuple [std, static] touchstone: '(build == "std") && (conf == "std")' - 'librseq_{version}_{cctype}': cctype: gccbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std, static] ccs: !!python/tuple [gcc-9, gcc-10, gcc-11, gcc-12] touchstone: '(build == "std") && (conf == "std") && (cc == "gcc-11")' - 'librseq_{version}_{cctype}': cctype: clangbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std, static] ccs: !!python/tuple [clang-11, clang-12, clang-13, clang-14] @@ -354,7 +354,7 @@ jobs: - 'dev_review_librseq_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist, oot-dist] confs: !!python/tuple [std, static] touchstone: '(build == "std") && (conf == "std")' diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index aeab7da..17924c0 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -321,7 +321,7 @@ jobs: - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, static, tls_fallback, debug-rcu] touchstone: '(build == "std") && (conf == "std")' @@ -392,7 +392,7 @@ jobs: - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, static, tls_fallback, debug-rcu] touchstone: '(build == "std") && (conf == "std")' diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml index d490530..cfeaaab 100644 --- a/jobs/lttng-analyses.yaml +++ b/jobs/lttng-analyses.yaml @@ -105,7 +105,7 @@ - job-template: name: lttng-analyses_{version}_pylint defaults: lttng-analyses - node: 'jammy-amd64' + node: 'deb12-amd64' triggers: - pollscm: @@ -113,7 +113,7 @@ builders: - copyartifact: - project: dev_upstream_babeltrace_{babeltrace_version}_linuxbuild/platform=jammy-amd64,build=std,conf=python-bindings + project: dev_upstream_babeltrace_{babeltrace_version}_linuxbuild/platform=deb12-amd64,build=std,conf=python-bindings which-build: last-successful stable: false filter: 'build/**' @@ -139,7 +139,7 @@ - master jobs: - 'lttng-analyses_{version}_linuxbuild': - platforms: !!python/tuple [jammy-amd64] + platforms: !!python/tuple [deb12-amd64] babeltrace_versions: !!python/tuple [stable-1.5] - 'lttng-analyses_{version}_pylint': babeltrace_version: stable-1.5 diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index c766980..ca71c3f 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -894,7 +894,7 @@ triggers: - gerrit: *lttng-tools_trigger_gerrit_smoke_1 - node: 'jammy-amd64' + node: 'deb12-amd64' builders: - shell: @@ -1059,7 +1059,7 @@ buildtype: linuxbuild version: master ustversion: master - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] urcuversions: !!python/tuple [master] @@ -1189,7 +1189,7 @@ buildtype: linuxbuild version: stable-2.13 ustversion: stable-2.13 - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] urcuversions: !!python/tuple [stable-0.13] @@ -1309,7 +1309,7 @@ buildtype: linuxbuild version: stable-2.12 ustversion: stable-2.12 - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] urcuversions: !!python/tuple [stable-0.13] @@ -1438,7 +1438,7 @@ buildtype: linuxbuild version: stable-2.11 ustversion: stable-2.11 - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] urcuversions: !!python/tuple [stable-0.11] @@ -1484,7 +1484,7 @@ buildtype: linuxbuild version: stable-2.10 ustversion: stable-2.10 - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] urcuversions: !!python/tuple [stable-0.9] @@ -1708,7 +1708,7 @@ - 'dev_review_lttng-tools_{version}_smokebuild': version: master buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [oot-dist] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support @@ -1718,7 +1718,7 @@ - 'dev_review_lttng-tools_{version}_clang-tidy': version: master buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64, deb12-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 diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index 124819a..5fbf11f 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -487,7 +487,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: linuxbuild version: master - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, dist, oot, oot-dist] confs: !!python/tuple [std, agents, debug-rcu, tls_fallback] liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master] @@ -556,7 +556,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: linuxbuild version: stable-2.13 - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, dist, oot, oot-dist] confs: !!python/tuple [std, agents, debug-rcu, tls_fallback] liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master] @@ -614,7 +614,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: linuxbuild version: stable-2.12 - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, dist, oot, oot-dist] confs: !!python/tuple [std, agents, debug-rcu, tls_fallback] liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master] @@ -680,7 +680,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: linuxbuild version: stable-2.11 - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-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] @@ -718,7 +718,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: linuxbuild version: stable-2.10 - platforms: !!python/tuple [jammy-amd64, deb12-amd64] + platforms: !!python/tuple [deb12-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] -- 2.34.1