From 6be04ad264b3f4a587c6367c56bdd6cf8862e7ac Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 1 Jun 2021 16:24:57 -0400 Subject: [PATCH] jjb: Remove urcu 0.10 for ust/tools >= 2.11 Signed-off-by: Michael Jeanson --- jobs/lttng-tools.yaml | 24 ++++++++++++------------ jobs/lttng-ust.yaml | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index dcaa531..be9cc9a 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -1403,7 +1403,7 @@ arch: !!python/tuple [amd64] build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] filter: '(build=="std") || ((babeltrace_version=="stable-1.5" && (conf=="std" || conf=="agents" || conf=="no-ust")))' @@ -1414,7 +1414,7 @@ arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] build: !!python/tuple [std] conf: !!python/tuple [std, no-ust, agents] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] filter: '' @@ -1425,7 +1425,7 @@ arch: !!python/tuple [sles12sp5] build: !!python/tuple [std] conf: !!python/tuple [agents] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] filter: '' @@ -1436,7 +1436,7 @@ arch: !!python/tuple [el8] build: !!python/tuple [std] conf: !!python/tuple [std] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] filter: '' @@ -1447,7 +1447,7 @@ arch: !!python/tuple [macos-amd64, macos-arm64] build: !!python/tuple [std] conf: !!python/tuple [relayd-only] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] filter: '' @@ -1457,7 +1457,7 @@ arch: !!python/tuple [cygwin64] build: !!python/tuple [std] conf: !!python/tuple [relayd-only] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] filter: '' @@ -1468,7 +1468,7 @@ arch: !!python/tuple [amd64] build: !!python/tuple [std] conf: !!python/tuple [std] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [full] filter: '' @@ -1479,14 +1479,14 @@ arch: !!python/tuple [amd64] build: !!python/tuple [std] conf: !!python/tuple [agents] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] filter: '' - 'lttng-tools_{version}_release': version: v2.11 ustversion: stable-2.11 - urcuversion: stable-0.10 + urcuversion: stable-0.12 babelversion: stable-1.5 # stable-2.10 @@ -1605,7 +1605,7 @@ ustversion: master - 'lttng-tools_{version}_scan-build': version: stable-2.11 - urcuversion: stable-0.10 + urcuversion: stable-0.12 ustversion: stable-2.11 - 'lttng-tools_{version}_scan-build': version: stable-2.10 @@ -1663,7 +1663,7 @@ arch: !!python/tuple [amd64] build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, no-ust, agents] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5, master] testtype: !!python/tuple [base] filter: '' @@ -1718,7 +1718,7 @@ arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] build: !!python/tuple [std] conf: !!python/tuple [std, no-ust, agents] - urcuversion: !!python/tuple [stable-0.10] + urcuversion: !!python/tuple [stable-0.12] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] filter: '' diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index 2b72128..27b1098 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -464,28 +464,28 @@ arch: !!python/tuple [amd64] build: !!python/tuple [std, dist, oot, oot-dist] conf: !!python/tuple [std, agents, debug-rcu, tls_fallback] - liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master] + liburcu_version: !!python/tuple [stable-0.9, stable-0.12, master] filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))' - 'lttng-ust_{version}_{buildtype}': buildtype: portbuild arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] build: !!python/tuple [std] conf: !!python/tuple [std, agents] - liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master] + liburcu_version: !!python/tuple [stable-0.9, stable-0.12, master] filter: '' - 'lttng-ust_{version}_{buildtype}': buildtype: slesbuild arch: !!python/tuple [sles12sp5] build: !!python/tuple [std] conf: !!python/tuple [agents] - liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master] + liburcu_version: !!python/tuple [stable-0.9, stable-0.12, master] filter: '' - 'lttng-ust_{version}_{buildtype}': buildtype: elbuild arch: !!python/tuple [el8] build: !!python/tuple [std] conf: !!python/tuple [std] - liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master] + liburcu_version: !!python/tuple [stable-0.9, stable-0.12, master] filter: '' - 'lttng-ust_{version}_cppcheck' - 'lttng-ust_{version}_scan-build' @@ -621,7 +621,7 @@ arch: !!python/tuple [sles12sp5] build: !!python/tuple [std] conf: !!python/tuple [agents] - liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master] + liburcu_version: !!python/tuple [stable-0.9, stable-0.12, master] filter: '' ## Stable 2.8 ## @@ -631,7 +631,7 @@ arch: !!python/tuple [sles12sp5] build: !!python/tuple [std] conf: !!python/tuple [agents] - liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master] + liburcu_version: !!python/tuple [stable-0.9, stable-0.12, master] filter: '' -- 2.34.1