From 568b5cbdb3503a176da4792ab9dd9469ef88f40e Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 25 Sep 2019 16:38:22 -0400 Subject: [PATCH] jjb: Add elbuild jobs Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 10 +++++++++ jobs/liburcu.yaml | 5 +++++ jobs/lttng-tools.yaml | 50 +++++++++++++++++++++++++++++++++++++++++++ jobs/lttng-ust.yaml | 25 ++++++++++++++++++++-- 4 files changed, 88 insertions(+), 2 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index ade2e88..b6e3e2d 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -653,6 +653,11 @@ version: # // support 1.3 on SLES12 - stable-1.3 - stable-1.5 + - 'babeltrace_{version}_{buildtype}': + buildtype: elbuild + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] - 'babeltrace_{version}_{buildtype}': buildtype: solarisbuild arch: !!python/tuple [sol10-i386, sol11-i386] @@ -701,6 +706,11 @@ arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] conf: !!python/tuple [std, prod] + - 'babeltrace_{version}_{buildtype}': + buildtype: elbuild + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std, prod] - 'babeltrace_{version}_{buildtype}': buildtype: macosxbuild arch: !!python/tuple [macosx] diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index c1c3562..912b826 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -337,6 +337,11 @@ arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] conf: !!python/tuple [std] + - 'liburcu_{version}_{buildtype}': + buildtype: elbuild + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] - 'liburcu_{version}_{buildtype}': buildtype: solarisbuild arch: !!python/tuple [sol10-i386, sol11-i386] diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index cac846b..1eaf7b2 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -671,6 +671,16 @@ urcuversion: !!python/tuple [master] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] + - 'lttng-tools_{version}_{buildtype}': + buildtype: elbuild + version: master + ustversion: master + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] + urcuversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] + testtype: !!python/tuple [base] - 'lttng-tools_{version}_{buildtype}': buildtype: macosxbuild version: master @@ -741,6 +751,16 @@ urcuversion: !!python/tuple [stable-0.10] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] + - 'lttng-tools_{version}_{buildtype}': + buildtype: elbuild + version: stable-2.11 + ustversion: stable-2.11 + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] + urcuversion: !!python/tuple [stable-0.10] + babelversion: !!python/tuple [stable-1.5] + testtype: !!python/tuple [base] - 'lttng-tools_{version}_{buildtype}': buildtype: solarisbuild version: stable-2.11 @@ -802,6 +822,16 @@ urcuversion: !!python/tuple [stable-0.9] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] + - 'lttng-tools_{version}_{buildtype}': + buildtype: elbuild + version: stable-2.10 + ustversion: stable-2.10 + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] + urcuversion: !!python/tuple [stable-0.9] + babelversion: !!python/tuple [stable-1.5] + testtype: !!python/tuple [base] - 'lttng-tools_{version}_{buildtype}': buildtype: solarisbuild version: stable-2.10 @@ -863,6 +893,16 @@ urcuversion: !!python/tuple [stable-0.9] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] + - 'lttng-tools_{version}_{buildtype}': + buildtype: elbuild + version: stable-2.9 + ustversion: stable-2.9 + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] + urcuversion: !!python/tuple [stable-0.9] + babelversion: !!python/tuple [stable-1.5] + testtype: !!python/tuple [base] - 'lttng-tools_{version}_{buildtype}': buildtype: solarisbuild version: stable-2.9 @@ -924,6 +964,16 @@ urcuversion: !!python/tuple [stable-0.9] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] + - 'lttng-tools_{version}_{buildtype}': + buildtype: elbuild + version: stable-2.8 + ustversion: stable-2.8 + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] + urcuversion: !!python/tuple [stable-0.9] + babelversion: !!python/tuple [stable-1.5] + testtype: !!python/tuple [base] - 'lttng-tools_{version}_{buildtype}': buildtype: solarisbuild version: stable-2.8 diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index 923dd7e..ff40494 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -47,8 +47,7 @@ project-type: matrix node: 'master' # Applies only to matrix flyweight task execution-strategy: - combination-filter: | - (build=="std") || (liburcu_version=="master") + combination-filter: '{filter}' axes: - axis: type: slave @@ -254,18 +253,28 @@ build: !!python/tuple [std, dist, oot, oot-dist] conf: !!python/tuple [std, agents, debug-rcu] liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, stable-0.11, master] + filter: '(build=="std") || (liburcu_version=="master")' - '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.8, stable-0.9, stable-0.10, stable-0.11, master] + filter: '' - 'lttng-ust_{version}_{buildtype}': buildtype: slesbuild arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] conf: !!python/tuple [std] liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.11, 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.11, master] + filter: '' - 'lttng-ust_{version}_cppcheck' - 'lttng-ust_{version}_scan-build' - 'lttng-ust_{version}_{buildtype}': @@ -275,6 +284,7 @@ build: !!python/tuple [std, dist, oot, oot-dist] conf: !!python/tuple [std, agents, debug-rcu] liburcu_version: !!python/tuple [stable-0.11, master] + filter: '(build=="std") || (liburcu_version=="master")' - 'lttng-ust_{version}_{buildtype}': buildtype: portbuild version: master @@ -282,6 +292,7 @@ build: !!python/tuple [std] conf: !!python/tuple [std, agents] liburcu_version: !!python/tuple [stable-0.11, master] + filter: '' - 'lttng-ust_{version}_{buildtype}': buildtype: slesbuild version: master @@ -289,6 +300,15 @@ build: !!python/tuple [std] conf: !!python/tuple [std] liburcu_version: !!python/tuple [stable-0.11, master] + filter: '' + - 'lttng-ust_{version}_{buildtype}': + buildtype: elbuild + version: master + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] + liburcu_version: !!python/tuple [stable-0.11, master] + filter: '' - 'lttng-ust_{version}_cppcheck': version: master - 'lttng-ust_{version}_scan-build': @@ -304,6 +324,7 @@ build: !!python/tuple [std] conf: !!python/tuple [std] liburcu_version: !!python/tuple [stable-0.9] + filter: '' - project: name: lttng-ust-views -- 2.34.1