From 7ff14a9767236737d53c52cefc9c992bdbe7d164 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Mon, 31 Jul 2023 16:03:06 -0400 Subject: [PATCH] jjb: Add deb12-amd64 platform to linuxbuilds Change-Id: I90921f505d4a6c3bdb38b7e0db3482ac7ca92317 --- automation/ansible/hosts | 9 +++++++ automation/ansible/playbooks/ci-instances.yml | 4 ++- .../ansible/roles/babeltrace/vars/Debian.yml | 1 + .../roles/compilers/vars/Debian-12.yml | 25 +++++++++++++++++++ automation/ansible/vars/ci-instances.yml | 8 ++++++ jobs/babeltrace.yaml | 6 ++--- jobs/barectf.yaml | 4 +-- jobs/binutils-gdb.yaml | 4 +-- jobs/librseq.yaml | 8 +++--- jobs/liburcu.yaml | 4 +-- jobs/lttng-tools.yaml | 14 +++++------ jobs/lttng-ust.yaml | 10 ++++---- 12 files changed, 71 insertions(+), 26 deletions(-) create mode 100644 automation/ansible/roles/compilers/vars/Debian-12.yml diff --git a/automation/ansible/hosts b/automation/ansible/hosts index f3a025d..fb74e55 100644 --- a/automation/ansible/hosts +++ b/automation/ansible/hosts @@ -127,6 +127,15 @@ 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 +ci-node-deb12-amd64-04 +ci-node-deb12-amd64-05 +ci-node-deb12-amd64-06 +ci-node-deb12-amd64-07 +ci-node-deb12-amd64-08 + [node_standalone] ci-rootnode-bionic-amd64-01 ci-rootnode-bionic-amd64-02 diff --git a/automation/ansible/playbooks/ci-instances.yml b/automation/ansible/playbooks/ci-instances.yml index b606a48..a4619d5 100644 --- a/automation/ansible/playbooks/ci-instances.yml +++ b/automation/ansible/playbooks/ci-instances.yml @@ -4,7 +4,7 @@ - ../vars/ci-instances.yml - ../roles/lxd/defaults/main.yml vars: - skp_lxd: false + skip_lxd: false skip_dns: false skip_jenkins: false jenkins_config: "~/.config/jenkins_jobs/jenkins_jobs.ini" @@ -49,6 +49,7 @@ node_state: "{{item.jenkins.state|default('online')}}" node_credentials: "{{item.jenkins.credentials|default(jenkins_default_credentials)}}" node_message: "{{item.jenkins.message|default('Set offline by ansible')}}" + node_mode: "{{item.jenkins.mode|default('NORMAL')}}" ansible.builtin.command: argv: [ '../scripts/update_jenkins_node.py', '-n', "{{node_name}}", @@ -56,6 +57,7 @@ '-c', "label={{node_label}}", '-c', "launcher/credentialsId={{node_credentials}}", '-c', "launcher/sshHostKeyVerificationStrategy=hudson.plugins.sshslaves.verifiers.ManuallyTrustedKeyVerificationStrategy=class", + '-c', "mode={{node_mode}}", '-s', "{{node_state}}", '-m', "{{node_message}}", '-f', "{{jenkins_config|expanduser}}", ] diff --git a/automation/ansible/roles/babeltrace/vars/Debian.yml b/automation/ansible/roles/babeltrace/vars/Debian.yml index dc9e024..d71e280 100644 --- a/automation/ansible/roles/babeltrace/vars/Debian.yml +++ b/automation/ansible/roles/babeltrace/vars/Debian.yml @@ -1,6 +1,7 @@ --- babeltrace_packages: - chrpath + - doxygen - libdw-dev - libelf-dev - libglib2.0-dev diff --git a/automation/ansible/roles/compilers/vars/Debian-12.yml b/automation/ansible/roles/compilers/vars/Debian-12.yml new file mode 100644 index 0000000..4c6c41f --- /dev/null +++ b/automation/ansible/roles/compilers/vars/Debian-12.yml @@ -0,0 +1,25 @@ +--- +compilers_packages: + - gcc + - gcc-11 + - gcc-12 + - g++ + - g++-11 + - g++-12 + - clang + - clang-13 + - clang-14 + - clang-15 + - libclang-dev + - libclang-13-dev + - libclang-14-dev + - libclang-15-dev + - clang-format + - clang-format-13 + - clang-format-14 + - clang-format-15 + - clang-tidy + - clang-tidy-13 + - clang-tidy-14 + - clang-tidy-15 + - bear diff --git a/automation/ansible/vars/ci-instances.yml b/automation/ansible/vars/ci-instances.yml index 11d9759..56170b6 100644 --- a/automation/ansible/vars/ci-instances.yml +++ b/automation/ansible/vars/ci-instances.yml @@ -74,45 +74,53 @@ containers: name: ci-node-deb12-amd64-01 jenkins: label: 'deb12-amd64 deb12' + mode: EXCLUSIVE - meta: address: 172.18.16.2 lxd: name: ci-node-deb12-amd64-02 jenkins: label: 'deb12-amd64 deb12' + mode: EXCLUSIVE - meta: address: 172.18.16.3 lxd: name: ci-node-deb12-amd64-03 jenkins: label: 'deb12-amd64 deb12' + mode: EXCLUSIVE - meta: address: 172.18.16.4 lxd: name: ci-node-deb12-amd64-04 jenkins: label: 'deb12-amd64 deb12' + mode: EXCLUSIVE - meta: address: 172.18.16.5 lxd: name: ci-node-deb12-amd64-05 jenkins: label: 'deb12-amd64 deb12' + mode: EXCLUSIVE - meta: address: 172.18.16.6 lxd: name: ci-node-deb12-amd64-06 jenkins: label: 'deb12-amd64 deb12' + mode: EXCLUSIVE - meta: address: 172.18.16.7 lxd: name: ci-node-deb12-amd64-07 jenkins: label: 'deb12-amd64 deb12' + mode: EXCLUSIVE - meta: address: 172.18.16.8 lxd: name: ci-node-deb12-amd64-08 jenkins: label: 'deb12-amd64 deb12' + mode: EXCLUSIVE diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 45995f8..05644bd 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -587,7 +587,7 @@ jobs: - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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 04dbc9c..da18362 100644 --- a/jobs/barectf.yaml +++ b/jobs/barectf.yaml @@ -167,7 +167,7 @@ jobs: - 'barectf_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64] + platforms: !!python/tuple [jammy-amd64, deb12-amd64] - project: name: review-barectf @@ -180,7 +180,7 @@ jobs: - 'dev_review_barectf_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64] + platforms: !!python/tuple [jammy-amd64, deb12-amd64] - project: name: barectf-views diff --git a/jobs/binutils-gdb.yaml b/jobs/binutils-gdb.yaml index 9a2d552..9f98111 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, deb12-amd64] target_boards: !!python/tuple ["unix", "native-gdbserver", "native-extended-gdbserver"] - project: diff --git a/jobs/librseq.yaml b/jobs/librseq.yaml index 9593063..2bfff94 100644 --- a/jobs/librseq.yaml +++ b/jobs/librseq.yaml @@ -320,20 +320,20 @@ jobs: - 'librseq_{version}_{buildtype}': buildtype: linuxbuild - platforms: !!python/tuple [jammy-amd64] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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 d9e4537..4edb92d 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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-tools.yaml b/jobs/lttng-tools.yaml index 0931f9c..14fda98 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -1059,7 +1059,7 @@ buildtype: linuxbuild version: master ustversion: master - platforms: !!python/tuple [jammy-amd64] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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 aea8484..124819a 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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] + platforms: !!python/tuple [jammy-amd64, 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