From 8713492f6f891c71b7951da43541638b1801772f Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 20 Apr 2020 11:11:45 -0400 Subject: [PATCH] jjb: Drop stable-2.8 except for sles Signed-off-by: Michael Jeanson --- jobs/lttng-tools.yaml | 75 ------------------------------------------- jobs/lttng-ust.yaml | 14 +++++++- 2 files changed, 13 insertions(+), 76 deletions(-) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 01ed7aa..b311eb4 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -825,7 +825,6 @@ github_name: lttng-tools email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com' version: - - stable-2.8 - stable-2.9 - stable-2.10 - stable-2.11 @@ -1238,26 +1237,6 @@ testtype: !!python/tuple [full] # stable-2.8 # - - 'lttng-tools_{version}_{buildtype}': - buildtype: build - version: stable-2.8 - ustversion: stable-2.8 - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist] - conf: !!python/tuple [std, no-ust, agents, debug-rcu] - urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.5] - testtype: !!python/tuple [base] - - 'lttng-tools_{version}_{buildtype}': - buildtype: portbuild - version: stable-2.8 - ustversion: stable-2.8 - arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] - build: !!python/tuple [std] - conf: !!python/tuple [std, no-ust, agents] - urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.5] - testtype: !!python/tuple [base] - 'lttng-tools_{version}_{buildtype}': buildtype: slesbuild version: stable-2.8 @@ -1268,36 +1247,6 @@ 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 - ustversion: stable-2.8 - arch: !!python/tuple [sol10-i386, sol11-i386] - build: !!python/tuple [std] - conf: !!python/tuple [relayd-only] - urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.5] - testtype: !!python/tuple [base] - - 'lttng-tools_{version}_long_regression': - buildtype: build - version: stable-2.8 - ustversion: stable-2.8 - arch: !!python/tuple [amd64] - build: !!python/tuple [std] - conf: !!python/tuple [std] - urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.5] - testtype: !!python/tuple [full] - 'lttng-tools_{version}_cppcheck' - 'lttng-tools_{version}_scan-build': @@ -1316,10 +1265,6 @@ version: stable-2.9 urcuversion: stable-0.9 ustversion: stable-2.9 - - 'lttng-tools_{version}_scan-build': - version: stable-2.8 - urcuversion: stable-0.9 - ustversion: stable-2.8 - 'lttng-tools_{version}_coverity': version: master urcuversion: master @@ -1383,16 +1328,6 @@ urcuversion: !!python/tuple [stable-0.9] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] - - 'dev_{user}_lttng-tools_{version}_{buildtype}': - buildtype: build - version: stable-2.8-staging - ustversion: stable-2.8 - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist] - conf: !!python/tuple [std, no-ust, agents] - urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.5] - testtype: !!python/tuple [base] - 'dev_{user}_lttng-tools_{version}_{buildtype}': buildtype: portbuild version: master-staging @@ -1443,16 +1378,6 @@ urcuversion: !!python/tuple [stable-0.9] babelversion: !!python/tuple [stable-1.5] testtype: !!python/tuple [base] - - 'dev_{user}_lttng-tools_{version}_{buildtype}': - buildtype: portbuild - version: stable-2.8-staging - ustversion: stable-2.8 - arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] - build: !!python/tuple [std] - conf: !!python/tuple [std, no-ust, agents] - urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.5] - testtype: !!python/tuple [base] - 'dev_{user}_lttng-tools_{version}_{buildtype}': buildtype: macosxbuild version: master-staging diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index 019a5c9..572abca 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -313,7 +313,6 @@ github_name: lttng-ust email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com' version: - - stable-2.8 - stable-2.9 - stable-2.10 - stable-2.11 @@ -348,6 +347,7 @@ filter: '' - 'lttng-ust_{version}_cppcheck' - 'lttng-ust_{version}_scan-build' + ## Master ## - 'lttng-ust_{version}_{buildtype}': buildtype: build @@ -387,6 +387,7 @@ version: master - 'lttng-ust_{version}_coverity': version: master + ## Stable 2.12 ## - 'lttng-ust_{version}_{buildtype}': buildtype: build @@ -425,6 +426,17 @@ - 'lttng-ust_{version}_scan-build': version: stable-2.12 + ## Stable 2.8 ## + - 'lttng-ust_{version}_{buildtype}': + buildtype: slesbuild + version: stable-2.8 + arch: !!python/tuple [sles12sp2] + build: !!python/tuple [std] + conf: !!python/tuple [std] + liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master] + filter: '' + + - project: name: gerrit-lttng-ust github_user: lttng -- 2.34.1