From 16b0246fd75fa42aa2b935821b0658d7ec85e189 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 26 Aug 2024 16:30:38 -0400 Subject: [PATCH 01/16] ansible: Add riscv64 nodes Change-Id: If900b4309ef54ae396559058fafdef96bfb3166c Signed-off-by: Michael Jeanson --- automation/ansible/hosts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/automation/ansible/hosts b/automation/ansible/hosts index 874999b..d332990 100644 --- a/automation/ansible/hosts +++ b/automation/ansible/hosts @@ -87,7 +87,10 @@ ci-node-deb12-ppc64el-01 ci-node-deb12-ppc64el-02 [node_riscv64] -172.16.0.138 +ci-node-deb13-riscv64-01 +ci-node-deb13-riscv64-02 +ci-node-deb13-riscv64-03 +ci-node-deb13-riscv64-04 [node_i386] ci-node-deb12-i386-1a-01 -- 2.34.1 From 855d636109f95299255021873152c42e33c49710 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 29 Aug 2024 10:40:28 -0400 Subject: [PATCH 02/16] ansible: remove binutils-gdb role from riscv64 nodes Not all dependencies are currently installable on riscv64 and we don't plan to run the gdb jobs on riscv64 at the moment. Change-Id: I64a25dbc6639ca122baec540ba70786d8965123f Signed-off-by: Michael Jeanson --- automation/ansible/node_riscv64.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/automation/ansible/node_riscv64.yml b/automation/ansible/node_riscv64.yml index a7c23f9..0ca4790 100644 --- a/automation/ansible/node_riscv64.yml +++ b/automation/ansible/node_riscv64.yml @@ -7,4 +7,3 @@ - liburcu - lttng-ust - lttng-tools - - binutils-gdb -- 2.34.1 From 52633bf03bb28c1f105ea9c07afaf07e431a2f6b Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 29 Aug 2024 10:42:10 -0400 Subject: [PATCH 03/16] ansible: common-node: explicitly install openjdk-17 Explicitly install version 17 of openjdk as this is currently required by our Jenkins setup and the default version varies between Debian releases. Change-Id: I28b1823b763fca989b4b7469582fed0166ad4e07 Signed-off-by: Michael Jeanson --- automation/ansible/roles/common-node/vars/Debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/ansible/roles/common-node/vars/Debian.yml b/automation/ansible/roles/common-node/vars/Debian.yml index 24250ff..9bd98dd 100644 --- a/automation/ansible/roles/common-node/vars/Debian.yml +++ b/automation/ansible/roles/common-node/vars/Debian.yml @@ -8,7 +8,7 @@ common_node_packages: - clang-tools - cloc - curl - - default-jdk-headless + - openjdk-17-jdk-headless - emacs-nox - flex - gettext -- 2.34.1 From ad7a1ca35324bcc322cb6f4ba95306d037db55d8 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 29 Aug 2024 10:50:09 -0400 Subject: [PATCH 04/16] ansible: babeltrace: add python3-setuptools on Debian Python 3.12 removed distutils, so we added support for setuptools in Babeltrace when building with Python >= 3.12. Install python3-setuptools as Python 3.12 as landed in Debian sid. Change-Id: Ia9db6dbd855f254d0ee1858c6e4de37585fd4da4 Signed-off-by: Michael Jeanson --- automation/ansible/roles/babeltrace/vars/Debian.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/ansible/roles/babeltrace/vars/Debian.yml b/automation/ansible/roles/babeltrace/vars/Debian.yml index 76ae912..a5ede24 100644 --- a/automation/ansible/roles/babeltrace/vars/Debian.yml +++ b/automation/ansible/roles/babeltrace/vars/Debian.yml @@ -8,6 +8,7 @@ babeltrace_packages: - libpopt-dev - python3-dev - python3-sphinx + - python3-setuptools - shellcheck - swig - uuid-dev -- 2.34.1 From aaa4ec8d6bdaf7cd1d96ffce2ea4e1d52884366d Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 29 Aug 2024 16:57:27 -0400 Subject: [PATCH 05/16] jjb: add riscv64 to portbuild jobs Add deb13-riscv64 to the main portbuild jobs, the boards are quite slow so don't add them to the dev_review jobs yet. Change-Id: I5c063cae03789ac1986641b8f517e81ef9e91a0b Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 4 ++-- jobs/librseq.yaml | 4 ++-- jobs/liburcu.yaml | 2 +- jobs/lttng-tools.yaml | 12 ++++++------ jobs/lttng-ust.yaml | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 67a7205..896872b 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -584,7 +584,7 @@ touchstone: '(build == "std") && (conf == "std")' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: portbuild - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, prod] filter: '' @@ -755,7 +755,7 @@ - 'dev_review_babeltrace_{version}_{buildtype}': version: stable-2.0 buildtype: portbuild - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std] filter: '' diff --git a/jobs/librseq.yaml b/jobs/librseq.yaml index 6a79668..96cfd77 100644 --- a/jobs/librseq.yaml +++ b/jobs/librseq.yaml @@ -333,7 +333,7 @@ touchstone: '' - 'librseq_{version}_{buildtype}': buildtype: portbuild - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, static] touchstone: '' @@ -353,7 +353,7 @@ touchstone: '' - 'dev_review_librseq_{version}_{buildtype}': buildtype: portbuild - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '' diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index 27ace61..ba7ae85 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -344,7 +344,7 @@ # Common - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: portbuild - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, static, tls_fallback, debug-rcu] touchstone: '(build == "std") && (conf == "std") && (platform == "deb12-i386")' diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 93a83e2..b424f0f 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -1080,7 +1080,7 @@ buildtype: portbuild version: master ustversion: master - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [master] @@ -1227,7 +1227,7 @@ buildtype: portbuild version: stable-2.13 ustversion: stable-2.13 - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [stable-0.13] @@ -1374,7 +1374,7 @@ buildtype: portbuild version: stable-2.12 ustversion: stable-2.12 - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [stable-0.13] @@ -1519,7 +1519,7 @@ buildtype: portbuild version: master-staging ustversion: master - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [master] @@ -1554,7 +1554,7 @@ buildtype: portbuild version: stable-2.13-staging ustversion: stable-2.13 - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [stable-0.13] @@ -1578,7 +1578,7 @@ buildtype: portbuild version: stable-2.12-staging ustversion: stable-2.12 - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [stable-0.13] diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index ee35d1d..6900822 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -555,7 +555,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: portbuild version: master - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, agents] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -615,7 +615,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: portbuild version: stable-2.13 - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, agents] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -664,7 +664,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: portbuild version: stable-2.12 - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] + platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb13-riscv64, deb12-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, agents] liburcu_versions: !!python/tuple [stable-0.13, master] -- 2.34.1 From 9d7f8cdabeed5ecdefca2a37d4bf2338c62cab95 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Wed, 4 Sep 2024 08:56:02 -0400 Subject: [PATCH 06/16] jjb: Use jgit for MacOSX Babeltrace jobs Following a number of checkout errors where git fetch hung and timed out from the OSX builder to review.lttng.org, `jgit` was tested as an alternative. The same hangs don't appear to happen when using `jgit`. Change-Id: I20231150e066b71acdec3f9b309d7f93ad76ac2f Signed-off-by: Kienan Stewart --- jobs/babeltrace.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 896872b..464d384 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -34,6 +34,7 @@ - origin/{version} basedir: src/babeltrace skip-tag: true + git-tool: '{git_tool}' triggers: - pollscm: @@ -315,6 +316,7 @@ - '$GERRIT_REFSPEC' basedir: src/babeltrace skip-tag: true + git-tool: '{git_tool}' triggers: - gerrit: &babeltrace_trigger_gerrit_defaults @@ -570,6 +572,7 @@ job_prefix: '' github_user: efficios github_name: babeltrace + git_tool: Default email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com' version: - stable-2.0 @@ -617,6 +620,7 @@ confs: !!python/tuple [std, prod] filter: '' touchstone: '' + git_tool: jgit - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: freebsdbuild platforms: !!python/tuple [freebsd-amd64] @@ -653,6 +657,7 @@ job_prefix: '' github_user: efficios github_name: babeltrace + git_tool: Default version: - stable-2.0 - ctf2 @@ -686,6 +691,7 @@ filter: '' touchstone: '' warnings_status: FAILED + git_tool: jgit - 'dev_review_babeltrace_{version}_{buildtype}': buildtype: slesbuild platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64] @@ -732,6 +738,7 @@ filter: '' touchstone: '' warnings_status: FAILED + git_tool: jgit - 'dev_review_babeltrace_{version}_{buildtype}': version: ctf2 buildtype: winbuild @@ -770,6 +777,7 @@ filter: '' touchstone: '' warnings_status: WARNING + git_tool: jgit - 'dev_review_babeltrace_{version}_{buildtype}': version: stable-2.0 buildtype: winbuild @@ -796,6 +804,7 @@ job_prefix: dev_upstream_ github_user: efficios github_name: babeltrace + git_tool: Default email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com' version: - stable-1.5 @@ -837,6 +846,7 @@ job_prefix: 'dev_jgalar_' github_user: jgalar github_name: babeltrace + git_tool: Default email_to: "jgalar@efficios.com" version: - stable-1.5-staging @@ -855,6 +865,7 @@ confs: !!python/tuple [std] filter: '' touchstone: '' + git_tool: jgit - project: @@ -862,6 +873,7 @@ job_prefix: 'dev_jgalar_' github_user: jgalar github_name: babeltrace + git_tool: Default email_to: "jgalar@efficios.com" version: - stable-2.0-staging @@ -884,6 +896,7 @@ confs: !!python/tuple [std, prod] filter: '' touchstone: '' + git_tool: jgit - project: -- 2.34.1 From 7a3e8988da566ce4e1c5d485583daf13feea81f3 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Wed, 4 Sep 2024 13:58:23 -0400 Subject: [PATCH 07/16] jjb: Run log4j2 lttng-ust-java-tests with LTTng-tools 2.14+ Change-Id: I96f540afea43ccfaa2df97a7edfa86ae816ca1f2 Signed-off-by: Kienan Stewart --- scripts/lttng-tools/build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index d6e9a86..75feed5 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -609,9 +609,15 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [[ ! "$conf" =~ (no-ust|relayd-only) "-Dlog4j-jar-location=${WORKSPACE}/deps/build/share/java/lttng-ust-agent-log4j.jar" "-Dlog4j2-jar-location=${WORKSPACE}/deps/build/share/java/lttng-ust-agent-log4j2.jar" "-DargLine=-Djava.library.path=${WORKSPACE}/deps/build/${LIBDIR_ARCH}" - '-Dgroups=!domain:log4j2' ) + # Merged into master ~ 47abf22b48023960069e1d3e23f42298ce4b3c2a + if verlt "${PACKAGE_VERSION}" "2.14" ; then + LTTNG_UST_JAVA_TESTS_MAVEN_OPTS+=( + '-Dgroups=!domain:log4j2' + ) + fi + env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" mvn -version if [[ -n "${LTTNG_TOOLS_UST_JAVA_TESTS_LOG4J_API_VERSION:-}" ]] ; then -- 2.34.1 From 1aad546538a390683be15488d1ead2c8b7c4018e Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Thu, 5 Sep 2024 15:29:53 -0400 Subject: [PATCH 08/16] jjb: Remove babeltrace CTF2 review jobs The ctf2 feature branch no longer exists. Change-Id: I77cbe254ca82f18ee7dff074fae04e33011d6369 Signed-off-by: Kienan Stewart --- jobs/babeltrace.yaml | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 464d384..caf74e2 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -660,7 +660,6 @@ git_tool: Default version: - stable-2.0 - - ctf2 - master jobs: ## Master ## @@ -710,45 +709,6 @@ touchstone: '' warnings_status: FAILED - ## ctf2 temp branch ## - - 'dev_review_babeltrace_{version}_{buildtype}': - version: ctf2 - buildtype: linuxbuild - platforms: !!python/tuple [deb12-amd64] - builds: !!python/tuple [std, oot, dist, oot-dist] - confs: !!python/tuple [std, static, prod, min] - filter: '' - touchstone: '' - warnings_status: FAILED - - 'dev_review_babeltrace_{version}_{buildtype}': - version: ctf2 - buildtype: portbuild - platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386] - builds: !!python/tuple [std] - confs: !!python/tuple [std] - filter: '' - touchstone: '' - warnings_status: FAILED - - 'dev_review_babeltrace_{version}_{buildtype}': - version: ctf2 - buildtype: macosbuild - platforms: !!python/tuple [macos-arm64] - builds: !!python/tuple [std] - confs: !!python/tuple [std, prod] - filter: '' - touchstone: '' - warnings_status: FAILED - git_tool: jgit - - 'dev_review_babeltrace_{version}_{buildtype}': - version: ctf2 - buildtype: winbuild - platforms: !!python/tuple [cygwin64, msys2-ucrt64] - builds: !!python/tuple [std] - confs: !!python/tuple [std] - filter: '' - touchstone: '' - warnings_status: FAILED - ## Stable 2.0 ## - 'dev_review_babeltrace_{version}_{buildtype}': version: stable-2.0 -- 2.34.1 From 932291da2c89df273a225c1713706eaaba8577b4 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 6 Sep 2024 15:52:22 -0400 Subject: [PATCH 09/16] jjb: Remove el7 platform from EL linux builds Change-Id: I4dd069efded84ee075604ffca138806eaad99924 Signed-off-by: Kienan Stewart --- jobs/babeltrace.yaml | 4 ++-- jobs/liburcu.yaml | 4 ++-- jobs/lttng-tools.yaml | 6 +++--- jobs/lttng-ust.yaml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index caf74e2..802330e 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -601,7 +601,7 @@ touchstone: '' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: elbuild - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64, el7-arm64, el8-arm64, el9-arm64] + platforms: !!python/tuple [el8-amd64, el9-amd64, el8-arm64, el9-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std, prod] filter: '' @@ -792,7 +792,7 @@ touchstone: '' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: elbuild - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] + platforms: !!python/tuple [el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] filter: '' diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index ba7ae85..83d31bc 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -356,7 +356,7 @@ touchstone: '(build == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: elbuild - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64, el7-arm64, el8-arm64, el9-arm64] + platforms: !!python/tuple [el8-amd64, el9-amd64, el8-arm64, el9-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' @@ -421,7 +421,7 @@ touchstone: '(build == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: elbuild - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] + platforms: !!python/tuple [el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index b424f0f..a7c9b64 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -1102,7 +1102,7 @@ buildtype: elbuild version: master ustversion: master - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64, el7-arm64, el8-arm64, el9-arm64] + platforms: !!python/tuple [el8-amd64, el9-amd64, el8-arm64, el9-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [master] @@ -1249,7 +1249,7 @@ buildtype: elbuild version: stable-2.13 ustversion: stable-2.13 - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64, el7-arm64, el8-arm64, el9-arm64] + platforms: !!python/tuple [el8-amd64, el9-amd64, el8-arm64, el9-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [stable-0.13] @@ -1396,7 +1396,7 @@ buildtype: elbuild version: stable-2.12 ustversion: stable-2.12 - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64, el7-arm64, el8-arm64, el9-arm64] + platforms: !!python/tuple [el8-amd64, el9-amd64, el8-arm64, el9-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [stable-0.13] diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index 6900822..b594507 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -573,7 +573,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: elbuild version: master - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64, el7-arm64, el8-arm64, el9-arm64] + platforms: !!python/tuple [el8-amd64, el9-amd64, el8-arm64, el9-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -633,7 +633,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: elbuild version: stable-2.13 - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64, el7-arm64, el8-arm64, el9-arm64] + platforms: !!python/tuple [el8-amd64, el9-amd64, el8-arm64, el9-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -682,7 +682,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: elbuild version: stable-2.12 - platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64, el7-arm64, el8-arm64, el9-arm64] + platforms: !!python/tuple [el8-amd64, el9-amd64, el8-arm64, el9-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] liburcu_versions: !!python/tuple [stable-0.13] -- 2.34.1 From 74997959a7f275717c74c2dacc0e16b58f48dfd1 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 6 Sep 2024 15:59:00 -0400 Subject: [PATCH 10/16] jjb: Remove special cases for EL7 from build scripts Change-Id: Ifaba321a0a52beacbc3b560245d7fc0c47542c02 Signed-off-by: Kienan Stewart --- scripts/babeltrace/build.sh | 4 ++-- scripts/lttng-tools/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index a0246ab..feea2f4 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -227,9 +227,9 @@ freebsd*) ;; esac -# Some warning flags are very dumb in GCC 4.8 on SLES12 / EL7, disable them +# Some warning flags are very dumb in GCC 4.8 on SLES12, disable them # even if they are available. -if [[ $platform = sles12sp5* ]] || [[ $platform = el7* ]]; then +if [[ $platform = sles12sp5* ]]; then CFLAGS="$CFLAGS -Wno-missing-field-initializers -Wno-shadow" CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers -Wno-shadow" fi diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index 75feed5..41b1fb7 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -286,9 +286,9 @@ cygwin|cygwin64|msys32|msys64) ;; esac -# Some warning flags are very dumb in GCC 4.8 on SLES12 / EL7, disable them +# Some warning flags are very dumb in GCC 4.8 on SLES12, disable them # even if they are available. -if [[ $platform = sles12sp5* ]] || [[ $platform = el7* ]]; then +if [[ $platform = sles12sp5* ]]; then CFLAGS="$CFLAGS -Wno-missing-field-initializers -Wno-shadow" CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers -Wno-shadow" fi -- 2.34.1 From 8328fee6aeed77f776edf5845e0b7b1b6a1119f1 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 6 Sep 2024 15:59:43 -0400 Subject: [PATCH 11/16] ansible: Remove EL7 hosts Change-Id: I45f1b717e051736e9f0eeb0edba87565f7941d3f Signed-off-by: Kienan Stewart --- automation/ansible/hosts | 2 -- 1 file changed, 2 deletions(-) diff --git a/automation/ansible/hosts b/automation/ansible/hosts index d332990..51b6328 100644 --- a/automation/ansible/hosts +++ b/automation/ansible/hosts @@ -229,10 +229,8 @@ ci-node-sles15sp5-amd64-2b-01 ci-node-sles15sp5-amd64-2c-01 [node_el] -ci-node-el7-amd64-02-01 ansible_python_interpreter=python2 ci-node-el8-amd64-03-01 ci-node-el9-amd64-02-01 -ci-node-el7-arm64-01 ci-node-el8-arm64-01 ci-node-el9-arm64-01 ci-rootnode-el8-amd64-1d-01 -- 2.34.1 From 92760c005ca5cbc1c8a3aa872517eadd8e9ae486 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Thu, 5 Sep 2024 15:13:13 -0400 Subject: [PATCH 12/16] jjb: Add clang builds for liburcu Change-Id: I79927757b51080790fd46d6bdf27ead2deab63d4 Signed-off-by: Kienan Stewart --- jobs/liburcu.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index 83d31bc..412aae4 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -202,6 +202,31 @@ <<: *liburcu_builders_defaults <<: *liburcu_publishers_defaults +- job-template: + name: '{job_prefix}liburcu_{version}_{cctype}' + defaults: liburcu + + <<: *liburcu_matrix_axes_defaults + axes: + - axis: + type: slave + name: platform + values: '{obj:platforms}' + - axis: + type: user-defined + name: conf + values: '{obj:confs}' + - axis: + type: user-defined + name: build + values: '{obj:builds}' + - axis: + type: user-defined + name: cc + values: '{obj:ccs}' + <<: *liburcu_builders_defaults + <<: *liburcu_publishers_defaults + - job-template: name: dev_review_liburcu_{version}_{buildtype} defaults: liburcu @@ -384,6 +409,14 @@ builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' + - '{job_prefix}liburcu_{version}_{cctype}': + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + platforms: !!python/tuple [deb12-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [std, static, atomic-builtins, tls_fallback, debug-rcu] + touchstone: '(build == "std") && (conf == "std")' - 'liburcu_{version}_scan-build' - 'liburcu_{version}_coverity': version: master -- 2.34.1 From b34c06354cc1ed5824782fe37b74c0a74d670c8c Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Thu, 5 Sep 2024 15:42:02 -0400 Subject: [PATCH 13/16] jjb: Add clang builds for lttng-ust Change-Id: I9d85c23775ffaee8c52aa0c62e7126c8d77a4bcf Signed-off-by: Kienan Stewart --- jobs/lttng-ust.yaml | 97 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 5 deletions(-) diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index b594507..9ecb82e 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -121,7 +121,12 @@ - copyartifact: <<: *lttng-ust_steps_copyartifact_defaults - project: '{job_prefix}liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=${{liburcu_conf}},build=std' + project: + !j2: | + {{job_prefix}}liburcu_{%- raw -%}${liburcu_version}{%- endraw -%} + _{{cctype|default(buildtype)}}/platform={%- raw %}${platform}{%- endraw -%} + ,build=std,conf={%- raw -%}${liburcu_conf}{%- endraw -%} + {%- if ccs|default(false) %},cc={%- raw -%}${cc}{%- endraw -%}{% endif -%} # Run the build - shell: @@ -164,7 +169,12 @@ - copyartifact: <<: *lttng-ust_steps_copyartifact_defaults - project: 'liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=${{liburcu_conf}},build=std' + project: + !j2: | + liburcu_{%- raw -%}${liburcu_version}{%- endraw -%} + _{{cctype|default(buildtype)}}/platform={%- raw %}${platform}{%- endraw -%} + ,build=std,conf={%- raw -%}${liburcu_conf}{%- endraw -%} + {%- if ccs|default(false) %},cc={%- raw -%}${cc}{%- endraw -%}{% endif -%} - copyartifact: <<: *lttng-ust_steps_copyartifact_defaults @@ -330,13 +340,33 @@ <<: *lttng-ust_builders_defaults <<: *lttng-ust_publishers_defaults +- job-template: + name: '{job_prefix}lttng-ust_{version}_{cctype}' + defaults: lttng-ust + <<: *lttng-ust_matrix_axes_defaults + axes: + - axis: + <<: *lttng-ust_matrix_axis_platform + - axis: + <<: *lttng-ust_matrix_axis_conf + - axis: + <<: *lttng-ust_matrix_axis_build + - axis: + <<: *lttng-ust_matrix_axis_liburcu_version + - axis: + type: user-defined + name: cc + values: '{obj:ccs}' + + <<: *lttng-ust_builders_defaults + <<: *lttng-ust_publishers_defaults - job-template: name: dev_review_lttng-ust_{version}_{buildtype} defaults: lttng-ust concurrent: true - scm: + scm: <tng-ust_dev_review_scm - git: url: https://review.lttng.org/lttng-ust refspec: 'refs/changes/*:refs/changes/*' @@ -345,7 +375,7 @@ basedir: src/lttng-ust skip-tag: true - triggers: + triggers: <tng-ust_dev_review_triggers - gerrit: <tng-ust_trigger_gerrit_defaults trigger-on: - comment-added-event: @@ -362,7 +392,7 @@ <<: *lttng-ust_builders_defaults <<: *lttng-ust_publishers_review - properties: + properties: <tng-ust_dev_review_properties - inject: properties-content: | PROJECT_NAME=lttng-ust @@ -373,6 +403,29 @@ categories: - 'gerrit-{buildtype}' +- job-template: + name: 'dev_review_lttng-ust_{version}_{cctype}' + defaults: lttng-ust + concurrent: true + scm: *lttng-ust_dev_review_scm + triggers: *lttng-ust_dev_review_triggers + properties: *lttng-ust_dev_review_properties + <<: *lttng-ust_matrix_axes_defaults + axes: + - axis: + <<: *lttng-ust_matrix_axis_platform + - axis: + <<: *lttng-ust_matrix_axis_conf + - axis: + <<: *lttng-ust_matrix_axis_build + - axis: + <<: *lttng-ust_matrix_axis_liburcu_version + - axis: + type: user-defined + name: cc + values: '{obj:ccs}' + <<: *lttng-ust_builders_defaults + <<: *lttng-ust_publishers_review - job-template: name: dev_review_lttng-ust_lttng-tools_{version}_{buildtype} @@ -597,6 +650,17 @@ liburcu_versions: !!python/tuple [stable-0.13, master] filter: '' touchstone: '' + - '{job_prefix}lttng-ust_{version}_{cctype}': + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + version: master + platforms: !!python/tuple [deb12-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [std, agents] + liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master] + filter: '' + touchstone: '' - 'lttng-ust_{version}_scan-build': version: master - 'lttng-ust_{version}_coverity': @@ -648,6 +712,17 @@ liburcu_versions: !!python/tuple [stable-0.13, master] filter: '' touchstone: '' + - '{job_prefix}lttng-ust_{version}_{cctype}': + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + version: stable-2.13 + platforms: !!python/tuple [deb12-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [agents] + liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master] + filter: '' + touchstone: '' - 'lttng-ust_{version}_scan-build': version: stable-2.13 @@ -754,6 +829,18 @@ liburcu_versions: !!python/tuple [stable-0.14] filter: '' touchstone: '' + - 'dev_review_lttng-ust_{version}_{cctype}': + cctype: clangbuild + ccs: ['clang-13', 'clang-14', 'clang-15', 'clang-16'] + version: master + buildtype: linuxbuild + platforms: !!python/tuple [deb12-amd64] + builds: !!python/tuple [std, oot, dist, oot-dist] + confs: !!python/tuple [std, agents] + filter: '' + touchstone: '' + liburcu_versions: !!python/tuple [stable-0.14] + babeltrace_version: stable-2.0 ## Stable 2.13 ## - 'dev_review_lttng-ust_{version}_{buildtype}': -- 2.34.1 From 478792395f9ade20dddd74f988542827cf6b78b8 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 6 Sep 2024 09:38:10 -0400 Subject: [PATCH 14/16] jjb: Add clang builds for lttng-tools Signed-off-by: Kienan Stewart Change-Id: I852ab648b0f5a405367b631e4a9a83fa9e0f452b --- jobs/lttng-tools.yaml | 232 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 225 insertions(+), 7 deletions(-) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index a7c9b64..0e40b90 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -108,11 +108,11 @@ node: 'master' # Applies only to matrix flyweight task execution-strategy: *lttng-tools_matrix_execution-strategy_defaults axes: - - axis: + - axis: <tng-tools_matrix_axis_root_node type: slave name: node values: '{obj:nodes}' - - axis: + - axis: <tng-tools_matrix_axis_root_platform <<: *lttng-tools_matrix_axis_platform type: user-defined - axis: *lttng-tools_matrix_axis_conf @@ -174,7 +174,11 @@ # Always copy liburcu artifacts - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=${{liburcu_conf}},build=std' + project: + !j2: | + {{urcu_job_prefix}}liburcu_{%- raw -%}${liburcu_version}{%- endraw -%} + _{{cctype|default(buildtype)}}/platform={%- raw %}${platform}{%- endraw -%} + ,conf={%- raw -%}${liburcu_conf}{%- endraw -%},build=std,{%- if ccs|default(false) -%}cc={%- raw -%}${cc}{%- endraw -%},{%- endif -%} # Always copy babeltrace artifacts - copyartifact: @@ -191,7 +195,11 @@ steps: - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: '{ust_job_prefix}lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},platform=${{platform}},conf=${{ust_conf}},build=std' + project: + !j2: | + {{ust_job_prefix}}lttng-ust_{{ustversion}}_{{cctype|default(buildtype)}}/liburcu_version={%- raw -%}${liburcu_version}{%- endraw -%} + ,platform={%- raw %}${platform}{%- endraw -%},conf={%- raw -%}${ust_conf}{%- endraw -%} + ,build=std,{% if ccs|default(false) %}cc={%- raw -%}${cc}{%- endraw -%}{% endif %} # rootbuild requires a checkout of modules - conditional-step: @@ -560,6 +568,36 @@ jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}' result: 'success' +- job-template: + name: '{job_prefix}lttng-tools_{version}_{cctype}' + defaults: lttng-tools + + <<: *lttng-tools_matrix_axes_defaults + axes: + - axis: + <<: *lttng-tools_matrix_axis_platform + - axis: + <<: *lttng-tools_matrix_axis_conf + - axis: + <<: *lttng-tools_matrix_axis_build + - axis: + <<: *lttng-tools_matrix_axis_liburcu_version + - axis: + <<: *lttng-tools_matrix_axis_babeltrace_version + - axis: + type: user-defined + name: cc + values: '{obj:ccs}' + + <<: *lttng-tools_builders_defaults + <<: *lttng-tools_publishers_defaults + + triggers: + - pollscm: *lttng-tools_trigger_pollscm_default + - reverse: + jobs: '{ust_job_prefix}lttng-ust_{version}_{cctype}' + result: 'success' + - job-template: name: 'dev_{user}_lttng-tools_{version}_{buildtype}' defaults: lttng-tools @@ -637,6 +675,47 @@ jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}' result: 'success' +- job-template: + name: '{job_prefix}lttng-tools_{version}_root_{cctype}' + defaults: lttng-tools + + scm: + - git: *lttng-tools_scm_git_default + + wrappers: + - ansicolor: *lttng-tools_wrapper_ansicolor_defaults + - timeout: + <<: *lttng-tools_wrapper_timeout_defaults + timeout: 10 + - timestamps + + <<: *lttng-tools_matrix_axes_rootbuild + axes: + - axis: + <<: *lttng-tools_matrix_axis_root_node + - axis: + <<: *lttng-tools_matrix_axis_root_platform + - axis: + <<: *lttng-tools_matrix_axis_conf + - axis: + <<: *lttng-tools_matrix_axis_build + - axis: + <<: *lttng-tools_matrix_axis_liburcu_version + - axis: + <<: *lttng-tools_matrix_axis_babeltrace_version + - axis: + type: user-defined + name: cc + values: '{obj:ccs}' + <<: *lttng-tools_builders_defaults + <<: *lttng-tools_publishers_rootbuild + + triggers: + - pollscm: *lttng-tools_trigger_pollscm_default + - reverse: + jobs: '{ust_job_prefix}lttng-ust_{version}_{cctype}' + result: 'success' + - job-template: name: '{job_prefix}lttng-tools_{version}_macosbuild' defaults: lttng-tools @@ -673,7 +752,7 @@ basedir: src/lttng-tools skip-tag: true - triggers: + triggers: <tng-tools_triggers_review_default - gerrit: <tng-tools_trigger_gerrit_default trigger-on: - comment-added-event: @@ -686,7 +765,7 @@ - branch-compare-type: 'PLAIN' branch-pattern: '{version}' - properties: + properties: <tng-tools_properties_review_defaults - inject: *lttng-tools_property_inject_defaults - build-discarder: days-to-keep: 1 @@ -698,7 +777,7 @@ <<: *lttng-tools_matrix_axes_defaults <<: *lttng-tools_builders_review - publishers: + publishers: <tng-tools_publishers_review_defaults # On build abort (timeout), wait 10 seconds before running the other post # build scripts, this will allow the processes to terminate and make the # build log more legible. @@ -719,6 +798,35 @@ - workspace-cleanup: *lttng-tools_publisher_workspace-cleanup_defaults - raw: *lttng-tools_publisher_proc-cleaner_defaults +- job-template: + name: 'dev_review_lttng-tools_{version}_{cctype}' + defaults: lttng-tools + concurrent: true + <<: *lttng-tools_matrix_axes_defaults + axes: + - axis: + <<: *lttng-tools_matrix_axis_platform + - axis: + <<: *lttng-tools_matrix_axis_conf + - axis: + <<: *lttng-tools_matrix_axis_build + - axis: + <<: *lttng-tools_matrix_axis_liburcu_version + - axis: + <<: *lttng-tools_matrix_axis_babeltrace_version + - axis: + type: user-defined + name: cc + values: '{obj:ccs}' + + <<: *lttng-tools_builders_review + <<: *lttng-tools_publishers_defaults + properties: *lttng-tools_properties_review_defaults + publishers: *lttng-tools_publishers_review_defaults + scm: + - git: *lttng-tools_scm_git_review + triggers: *lttng-tools_triggers_review_default + - job-template: name: dev_review_lttng-tools_{version}_smokebuild defaults: lttng-tools @@ -887,6 +995,37 @@ - archive: *lttng-tools_publisher_archive_defaults - workspace-cleanup: *lttng-tools_publisher_workspace-cleanup_defaults +- job-template: + name: 'dev_review_lttng-tools_{version}_root_{cctype}' + defaults: lttng-tools + concurrent: true + <<: *lttng-tools_matrix_axes_rootbuild + axes: + - axis: + <<: *lttng-tools_matrix_axis_root_node + - axis: + <<: *lttng-tools_matrix_axis_root_platform + - axis: + <<: *lttng-tools_matrix_axis_conf + - axis: + <<: *lttng-tools_matrix_axis_build + - axis: + <<: *lttng-tools_matrix_axis_liburcu_version + - axis: + <<: *lttng-tools_matrix_axis_babeltrace_version + - axis: + type: user-defined + name: cc + values: '{obj:ccs}' + + <<: *lttng-tools_builders_review + <<: *lttng-tools_publishers_defaults + properties: *lttng-tools_properties_review_defaults + publishers: *lttng-tools_publishers_review_defaults + scm: + - git: *lttng-tools_scm_git_review + triggers: *lttng-tools_triggers_review_default + - job-template: name: 'dev_review_lttng-tools_{version}_check-format' defaults: lttng-tools @@ -1141,6 +1280,19 @@ babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' + - '{job_prefix}lttng-tools_{version}_{cctype}': + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + version: master + ustversion: master + platforms: !!python/tuple [deb12-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [std] + urcuversions: !!python/tuple [master] + babelversions: !!python/tuple [stable-2.0] + filter: '' + touchstone: '' - '{job_prefix}lttng-tools_{version}_long_regression': buildtype: linuxbuild version: master @@ -1200,6 +1352,20 @@ babelversions: !!python/tuple [stable-2.0] filter: '(node=="el8-amd64-rootnode" && platform=="el8-amd64")' touchstone: '' + - '{job_prefix}lttng-tools_{version}_root_{cctype}': + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + version: master + ustversion: master + platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode] + builds: !!python/tuple [std] + confs: !!python/tuple [agents] + urcuversions: !!python/tuple [master] + babelversions: !!python/tuple [stable-2.0] + filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' + touchstone: '' - 'lttng-tools_{version}_scan-build': version: master urcuversion: master @@ -1288,6 +1454,19 @@ babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' + - '{job_prefix}lttng-tools_{version}_{cctype}': + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + version: stable-2.13 + ustversion: stable-2.13 + platforms: !!python/tuple [deb12-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [std] + urcuversions: !!python/tuple [stable-0.13] + babelversions: !!python/tuple [stable-2.0] + filter: '' + touchstone: '' - '{job_prefix}lttng-tools_{version}_long_regression': buildtype: linuxbuild version: stable-2.13 @@ -1347,6 +1526,20 @@ babelversions: !!python/tuple [stable-2.0] filter: '(node=="el8-amd64-rootnode" && platform=="el8-amd64")' touchstone: '' + - '{job_prefix}lttng-tools_{version}_root_{cctype}': + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + version: stable-2.13 + ustversion: stable-2.13 + platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode] + builds: !!python/tuple [std] + confs: !!python/tuple [agents] + urcuversions: !!python/tuple [master] + babelversions: !!python/tuple [stable-2.0] + filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' + touchstone: '' - 'lttng-tools_{version}_release': version: v2.13 ustversion: stable-2.13 @@ -1605,6 +1798,18 @@ babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' + - 'dev_review_lttng-tools_{version}_{cctype}': + version: master + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + platforms: !!python/tuple [deb12-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [std] + urcuversions: !!python/tuple [stable-0.14] + babelversions: !!python/tuple [stable-2.0] + filter: '' + touchstone: '' - 'dev_review_lttng-tools_{version}_{buildtype}': version: master buildtype: slesbuild @@ -1627,6 +1832,19 @@ babelversions: !!python/tuple [stable-2.0] filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' touchstone: '' + - 'dev_review_lttng-tools_{version}_root_{cctype}': + version: master + buildtype: linuxbuild + cctype: clangbuild + ccs: !!python/tuple [clang-13, clang-14, clang-15, clang-16] + nodes: !!python/tuple [deb12-amd64-rootnode] + platforms: !!python/tuple [deb12-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [agents] + urcuversions: !!python/tuple [stable-0.14] + babelversions: !!python/tuple [stable-2.0] + filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' + touchstone: '' - 'dev_review_lttng-tools_{version}_root_{buildtype}': version: master buildtype: slesbuild -- 2.34.1 From e084b00dc720b9c18107d07ac7b80f58afab8691 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Mon, 9 Sep 2024 10:15:15 -0400 Subject: [PATCH 15/16] ansible: Install web tools on developer nodes Change-Id: I0707e8db6abdd29f0f9a5558f156799ac1544f85 Signed-off-by: Kienan Stewart --- automation/ansible/roles/developer/defaults/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/ansible/roles/developer/defaults/main.yml b/automation/ansible/roles/developer/defaults/main.yml index 9533df0..7d6cfe9 100644 --- a/automation/ansible/roles/developer/defaults/main.yml +++ b/automation/ansible/roles/developer/defaults/main.yml @@ -9,7 +9,9 @@ developer_tui_packages: - emacs-nox - gdb - git-review + - npm # For working on web sites - pkg-config + - ruby-bundler # For working on web sites - tmux - vim-nox # wget may be used by some vlttng commands -- 2.34.1 From 53155401c9dc03ee67cfcc8a0301f2e49ca1a5c5 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Mon, 9 Sep 2024 14:14:32 -0400 Subject: [PATCH 16/16] ansible: Install prometheus metrics plugin on Jenkins servers Change-Id: Ic79f3e341408a6ede06ac08e5194a222023295fe Signed-off-by: Kienan Stewart --- automation/ansible/roles/jenkins/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/ansible/roles/jenkins/defaults/main.yml b/automation/ansible/roles/jenkins/defaults/main.yml index b2e9ec7..636914f 100644 --- a/automation/ansible/roles/jenkins/defaults/main.yml +++ b/automation/ansible/roles/jenkins/defaults/main.yml @@ -58,6 +58,7 @@ jenkins_plugins: - postbuildscript - PrioritySorter - proc-cleaner-plugin + - prometheus - promoted-builds - publish-over-ssh - purge-build-queue-plugin -- 2.34.1