From 94a6d1fb51c37ac763dab5abb01f04ab91d91ff6 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 15 Aug 2022 10:01:31 -0400 Subject: [PATCH] jjb: lttng-ust: prepare for ubuntu jammy upgrade Change-Id: I79bbd588c18577fcf2a8f858f43106c2e4ff6d3c Signed-off-by: Michael Jeanson --- jobs/lttng-ust.yaml | 73 +++++++++++++++++++------------------- scripts/lttng-ust/build.sh | 6 ++-- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index ec413e1..5364d8a 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -57,10 +57,10 @@ expr: '{touchstone}' result: unstable axes: - - axis: <tng-ust_matrix_axis_arch + - axis: <tng-ust_matrix_axis_platform type: slave - name: arch - values: '{obj:archs}' + name: platform + values: '{obj:platforms}' - axis: <tng-ust_matrix_axis_conf type: user-defined name: conf @@ -80,7 +80,7 @@ node: 'master' # Applies only to matrix flyweight task execution-strategy: *lttng-ust_matrix_execution-strategy_defaults axes: - - axis: *lttng-ust_matrix_axis_arch + - axis: *lttng-ust_matrix_axis_platform - axis: *lttng-ust_matrix_axis_conf - axis: *lttng-ust_matrix_axis_build @@ -119,7 +119,7 @@ - copyartifact: <<: *lttng-ust_steps_copyartifact_defaults - project: '{job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{liburcu_conf}},build=std' + project: '{job_prefix}liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=${{liburcu_conf}},build=std' # Run the build - shell: @@ -162,11 +162,11 @@ - copyartifact: <<: *lttng-ust_steps_copyartifact_defaults - project: 'liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{liburcu_conf}},build=std' + project: 'liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=${{liburcu_conf}},build=std' - copyartifact: <<: *lttng-ust_steps_copyartifact_defaults - project: 'babeltrace_{babeltrace_version}_{buildtype}/arch=${{arch}},conf=std,build=std' + project: 'babeltrace_{babeltrace_version}_{buildtype}/platform=${{platform}},conf=std,build=std' - shell: | #!/bin/bash @@ -454,7 +454,7 @@ - job-template: name: lttng-ust_{version}_scan-build defaults: lttng-ust - node: 'amd64' + node: 'bionic-amd64' triggers: - pollscm: @@ -463,7 +463,7 @@ builders: - copyartifact: <<: *lttng-ust_steps_copyartifact_defaults - project: liburcu_master_build/arch=amd64,conf=std,build=std + project: liburcu_master_build/platform=bionic-amd64,conf=std,build=std - shell: !include-raw-escape: scripts/common/scan-build.sh @@ -478,7 +478,7 @@ - job-template: name: lttng-ust_{version}_coverity defaults: lttng-ust - node: 'amd64' + node: 'bionic-amd64' triggers: - pollscm: @@ -498,7 +498,7 @@ builders: - copyartifact: <<: *lttng-ust_steps_copyartifact_defaults - project: liburcu_master_build/arch=amd64,conf=std,build=std + project: liburcu_master_build/platform=bionic-amd64,conf=std,build=std - shell: !include-raw-escape: scripts/common/coverity.sh @@ -528,7 +528,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: build version: master - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-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, master] @@ -537,7 +537,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: portbuild version: master - archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, agents] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -546,7 +546,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: slesbuild version: master - archs: !!python/tuple [sles12sp5] + platforms: !!python/tuple [sles12sp5-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -555,7 +555,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: elbuild version: master - archs: !!python/tuple [el7, el8, el9] + platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -564,7 +564,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: freebsdbuild version: master - archs: !!python/tuple [freebsd] + platforms: !!python/tuple [freebsd-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -581,7 +581,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: build version: stable-2.13 - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-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, master] @@ -590,7 +590,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: portbuild version: stable-2.13 - archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, agents] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -599,7 +599,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: slesbuild version: stable-2.13 - archs: !!python/tuple [sles12sp5] + platforms: !!python/tuple [sles12sp5-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -608,7 +608,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: elbuild version: stable-2.13 - archs: !!python/tuple [el7, el8, el9] + platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] liburcu_versions: !!python/tuple [stable-0.13, master] @@ -623,7 +623,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: build version: stable-2.12 - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-amd64] builds: !!python/tuple [std, dist, oot, oot-dist] confs: !!python/tuple [std, agents, debug-rcu, tls_fallback] liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master] @@ -632,8 +632,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: portbuild version: stable-2.12 - archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] - archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386] builds: !!python/tuple [std] confs: !!python/tuple [std, agents] liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master] @@ -642,7 +641,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: slesbuild version: stable-2.12 - archs: !!python/tuple [sles12sp5] + platforms: !!python/tuple [sles12sp5-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master] @@ -651,7 +650,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: elbuild version: stable-2.12 - archs: !!python/tuple [el7, el8, el9] + platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master] @@ -674,7 +673,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: build version: stable-2.11 - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-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] @@ -683,7 +682,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: portbuild version: stable-2.11 - archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.11] @@ -692,7 +691,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: slesbuild version: stable-2.11 - archs: !!python/tuple [sles12sp5] + platforms: !!python/tuple [sles12sp5-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.11] @@ -701,7 +700,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: elbuild version: stable-2.11 - archs: !!python/tuple [el7, el8, el9] + platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] liburcu_versions: !!python/tuple [stable-0.11] @@ -712,7 +711,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: build version: stable-2.10 - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-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] @@ -721,7 +720,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: portbuild version: stable-2.10 - archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.9] @@ -730,7 +729,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: slesbuild version: stable-2.10 - archs: !!python/tuple [sles12sp5] + platforms: !!python/tuple [sles12sp5-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.9] @@ -739,7 +738,7 @@ - '{job_prefix}lttng-ust_{version}_{buildtype}': buildtype: elbuild version: stable-2.10 - archs: !!python/tuple [el7, el8, el9] + platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] liburcu_versions: !!python/tuple [stable-0.9] @@ -755,7 +754,7 @@ jobs: - 'dev_gerrit_lttng-ust_{buildtype}': buildtype: build - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-amd64] builds: !!python/tuple [std, oot, dist, oot-dist] confs: !!python/tuple [std, agents] liburcu_versions: !!python/tuple [stable-0.13] @@ -763,7 +762,7 @@ touchstone: '' - 'dev_gerrit_lttng-ust_lttng-tools_{buildtype}': buildtype: build - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-amd64] builds: !!python/tuple [std, oot, dist, oot-dist] confs: !!python/tuple [std, agents] filter: '' @@ -772,7 +771,7 @@ babeltrace_version: stable-2.0 - 'dev_gerrit_lttng-ust_{buildtype}': buildtype: portbuild - archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.13] @@ -780,7 +779,7 @@ touchstone: '' - 'dev_gerrit_lttng-ust_{buildtype}': buildtype: freebsdbuild - archs: !!python/tuple [freebsd] + platforms: !!python/tuple [freebsd-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] liburcu_versions: !!python/tuple [stable-0.13] diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh index 7341b0c..0e7b5c7 100755 --- a/scripts/lttng-ust/build.sh +++ b/scripts/lttng-ust/build.sh @@ -84,7 +84,7 @@ failed_configure() { # Required variables WORKSPACE=${WORKSPACE:-} -arch=${arch:-} +platform=${platform:-} conf=${conf:-} build=${build:-} cc=${cc:-} @@ -145,7 +145,7 @@ if [ "x${CC:-}" != "x" ]; then fi # Set platform variables -case "$arch" in +case "$platform" in freebsd*) export MAKE=gmake export TAR=tar @@ -184,7 +184,7 @@ PACKAGE_VERSION=${PACKAGE_VERSION//\-pre*/} # Gerrit will trigger build on FreeBSD regardless of the branch, exit # successfuly when the version is < 2.13. -if [[ $arch == freebsd* ]] && verlt "$PACKAGE_VERSION" "2.13"; then +if [[ $platform == freebsd* ]] && verlt "$PACKAGE_VERSION" "2.13"; then mkdir -p "$WORKSPACE/tap/no-log" echo "1..1" > "$WORKSPACE/tap/no-log/tests.log" echo "ok 1 - FreeBSD build unsupported in < 2.13" >> "$WORKSPACE/tap/no-log/tests.log" -- 2.34.1