From 0104d1467c57eb16b2ae852e8c5acec817a0b064 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 20 Apr 2020 11:26:29 -0400 Subject: [PATCH] jjb: Drop stable-2.9 except for sles Signed-off-by: Michael Jeanson --- jobs/lttng-tools.yaml | 94 ------------------------------------------- jobs/lttng-ust.yaml | 11 ++++- 2 files changed, 10 insertions(+), 95 deletions(-) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index b311eb4..c6b0247 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.9 - stable-2.10 - stable-2.11 - stable-2.12 @@ -1156,26 +1155,6 @@ testtype: !!python/tuple [full] # stable-2.9 # - - 'lttng-tools_{version}_{buildtype}': - buildtype: build - version: stable-2.9 - ustversion: stable-2.9 - 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.9 - ustversion: stable-2.9 - 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.9 @@ -1186,55 +1165,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.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 - ustversion: stable-2.9 - 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}_{buildtype}': - buildtype: macosxbuild - version: stable-2.9 - ustversion: stable-2.9 - arch: !!python/tuple [macosx] - 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}_winbuild': - version: stable-2.9 - ustversion: stable-2.9 - arch: !!python/tuple [cygwin64] - 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.9 - ustversion: stable-2.9 - 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] # stable-2.8 # - 'lttng-tools_{version}_{buildtype}': @@ -1261,10 +1191,6 @@ version: stable-2.10 urcuversion: stable-0.9 ustversion: stable-2.10 - - 'lttng-tools_{version}_scan-build': - version: stable-2.9 - urcuversion: stable-0.9 - ustversion: stable-2.9 - 'lttng-tools_{version}_coverity': version: master urcuversion: master @@ -1318,16 +1244,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.9-staging - ustversion: stable-2.9 - 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 @@ -1368,16 +1284,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.9-staging - ustversion: stable-2.9 - 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 572abca..3da74c1 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.9 - stable-2.10 - stable-2.11 jobs: @@ -426,6 +425,16 @@ - 'lttng-ust_{version}_scan-build': version: stable-2.12 + ## Stable 2.9 ## + - 'lttng-ust_{version}_{buildtype}': + buildtype: slesbuild + version: stable-2.9 + 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: '' + ## Stable 2.8 ## - 'lttng-ust_{version}_{buildtype}': buildtype: slesbuild -- 2.34.1