From 1794bc79e85035db21907bd9cf5c40f895258788 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 12 Aug 2022 16:01:52 -0400 Subject: [PATCH] jjb: liburcu: prepare for ubuntu jammy upgrade Change-Id: Ifae3819c02cda95a6a82800c5c89298f24532c0d Signed-off-by: Michael Jeanson --- jobs/liburcu.yaml | 48 ++++++++++++++++++++++------------------ scripts/liburcu/build.sh | 4 ++-- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index 5259304..992b413 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -74,8 +74,8 @@ axes: - axis: type: slave - name: arch - values: '{obj:archs}' + name: platform + values: '{obj:platforms}' - axis: type: user-defined name: conf @@ -93,7 +93,7 @@ - conditional-step: condition-kind: strings-match on-evaluation-failure: run - condition-string1: {{ '${{arch}}' }} + condition-string1: {{ '${{platform}}' }} condition-string2: 'cygwin64' steps: - shell: @@ -263,7 +263,7 @@ - job-template: name: liburcu_{version}_scan-build defaults: liburcu - node: 'amd64' + node: 'bionic-amd64' triggers: - pollscm: @@ -283,7 +283,7 @@ - job-template: name: liburcu_{version}_coverity defaults: liburcu - node: 'amd64' + node: 'bionic-amd64' triggers: - pollscm: @@ -330,45 +330,51 @@ - stable-0.13 - master jobs: + - '{job_prefix}liburcu_{version}_{buildtype}': + buildtype: linuxbuild + platforms: !!python/tuple [jammy-amd64] + builds: !!python/tuple [std, oot, dist] + confs: !!python/tuple [std, static, tls_fallback, debug-rcu] + touchstone: '(build == "std") && (conf == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: build - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, static, tls_fallback, debug-rcu] touchstone: '(build == "std") && (conf == "std")' - '{job_prefix}liburcu_{version}_{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 [std, static, tls_fallback, debug-rcu] - touchstone: '(build == "std") && (conf == "std") && (arch == "i386")' + touchstone: '(build == "std") && (conf == "std") && (platform == "deb11-i386")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: slesbuild - archs: !!python/tuple [sles12sp5] + platforms: !!python/tuple [sles12sp5-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: elbuild - archs: !!python/tuple [el7, el8, el9] + platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: macosbuild - archs: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-amd64, macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: winbuild - archs: !!python/tuple [cygwin64] + platforms: !!python/tuple [cygwin64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: freebsdbuild - archs: !!python/tuple [freebsd] + platforms: !!python/tuple [freebsd-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' @@ -390,26 +396,26 @@ - stable-0.11 jobs: - '{job_prefix}liburcu_{version}_{buildtype}': - buildtype: build - archs: !!python/tuple [amd64] + buildtype: linuxbuild + platforms: !!python/tuple [jammy-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, static, tls_fallback, debug-rcu] touchstone: '(build == "std") && (conf == "std")' - '{job_prefix}liburcu_{version}_{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 [std, static, tls_fallback, debug-rcu] - touchstone: '(build == "std") && (conf == "std") && (arch == "i386")' + touchstone: '(build == "std") && (conf == "std") && (platform == "deb11-i386")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: slesbuild - archs: !!python/tuple [sles12sp5] + platforms: !!python/tuple [sles12sp5-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: elbuild - archs: !!python/tuple [el7, el8, el9] + platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' @@ -422,13 +428,13 @@ jobs: - 'dev_gerrit_liburcu_{buildtype}': buildtype: build - archs: !!python/tuple [amd64] + platforms: !!python/tuple [bionic-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, static, tls_fallback, debug-rcu] touchstone: '(build == "std")' - 'dev_gerrit_liburcu_{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 [std] touchstone: '(build == "std")' diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index e5a57e0..6f12aa6 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -84,7 +84,7 @@ failed_configure() { # Required variables WORKSPACE=${WORKSPACE:-} -arch=${arch:-} +platform=${platform:-} conf=${conf:-} build=${build:-} cc=${cc:-} @@ -134,7 +134,7 @@ if [ "x${CC:-}" != "x" ]; then fi # Set platform variables -case "$arch" in +case "$platform" in macos*) export MAKE=make export TAR=tar -- 2.34.1