X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=e175f2b55aaeaad4e5c7f375bfe2e49cc56bc0dc;hb=60428fd0fcadf7f71b4b56c0b9b0ce26597ab4c2;hp=be9cc9a3f44b24b6dcfef31a027fc9a434ae93a2;hpb=6be04ad264b3f4a587c6367c56bdd6cf8862e7ac;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index be9cc9a..e175f2b 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -316,6 +316,13 @@
          !include-raw-escape: scripts/lttng-tools/gerrit-depends-on.sh
       - inject:
           properties-file: gerrit_custom_dependencies.properties
+      - copyartifact:
+              project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
+              which-build: last-successful
+              stable: false
+              filter: 'build/**'
+              target: 'deps'
+              do-not-fingerprint: true
       - conditional-step:
           condition-kind: and
           on-evaluation-failure: run
@@ -324,7 +331,7 @@
                 condition-command: 'test -z "$GERRIT_DEP_LTTNG_UST"'
               - condition-kind: regex-match
                 label: '$conf'
-                regex: (std|static|agents|debug-rcu)
+                regex: (std|agents)
           steps:
             - copyartifact:
                 project: lttng-ust_${{GERRIT_BRANCH}}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std
@@ -334,50 +341,9 @@
                 target: 'deps'
                 do-not-fingerprint: true
       - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: (std|static)
-          on-evaluation-failure: run
-          steps:
-            - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{conf}},build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-            - copyartifact:
-                project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=${{conf}},build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-      - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: no-ust
-          on-evaluation-failure: run
-          steps:
-            - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-            - copyartifact:
-                project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-      - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: (agents|relayd-only)
+          condition-kind: shell
           on-evaluation-failure: run
+          condition-command: 'test -z "$GERRIT_DEP_USERSPACE_RCU"'
           steps:
             - copyartifact:
                 project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
@@ -386,35 +352,19 @@
                 filter: 'build/**'
                 target: 'deps'
                 do-not-fingerprint: true
-            - copyartifact:
-                project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
+      - shell:
+         !include-raw-escape: scripts/lttng-tools/clean_processes_coredump.sh
       - conditional-step:
-          condition-kind: regex-match
-          label: '$conf'
-          regex: debug-rcu
-          on-evaluation-failure: run
+          condition-kind: shell
+          condition-command: 'test ! -z "$GERRIT_DEP_USERSPACE_RCU"'
           steps:
-            - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{conf}},build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
-            - copyartifact:
-                project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
+            - shell:
+               !include-raw-escape:
+                   - scripts/common/override-build-std.sh
+                   - scripts/common/print.sh
+                   - scripts/liburcu/build.sh
       - shell:
-         !include-raw-escape: scripts/lttng-tools/clean_processes_coredump.sh
+         !include-raw-escape: scripts/lttng-tools/gerrit-install-deps.sh
       - conditional-step:
           condition-kind: shell
           condition-command: 'test ! -z "$GERRIT_DEP_LTTNG_UST"'
@@ -1215,7 +1165,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.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
@@ -1226,7 +1176,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.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: ''
@@ -1237,7 +1187,7 @@
           arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          urcuversion: !!python/tuple [stable-0.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: ''
@@ -1248,7 +1198,7 @@
           arch: !!python/tuple [el8]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          urcuversion: !!python/tuple [stable-0.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: ''
@@ -1259,7 +1209,7 @@
           arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: ''
@@ -1269,7 +1219,7 @@
           arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: ''
@@ -1280,7 +1230,7 @@
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          urcuversion: !!python/tuple [stable-0.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [full]
           filter: ''
@@ -1291,14 +1241,14 @@
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          urcuversion: !!python/tuple [stable-0.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_release':
           version: v2.13
           ustversion: stable-2.13
-          urcuversion: stable-0.12
+          urcuversion: stable-0.13
           babelversion: stable-2.0
 
       # stable-2.12
@@ -1572,32 +1522,6 @@
           urcuversion: stable-0.9
           babelversion: stable-1.5
 
-      # stable-2.9 #
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: slesbuild
-          version: stable-2.9
-          ustversion: stable-2.9
-          arch: !!python/tuple [sles12sp5]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
-
-      # stable-2.8 #
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: slesbuild
-          version: stable-2.8
-          ustversion: stable-2.8
-          arch: !!python/tuple [sles12sp5]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
-
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master
@@ -1754,7 +1678,7 @@
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, no-ust, agents]
-          urcuversion: !!python/tuple [stable-0.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
           filter: ''
@@ -1763,7 +1687,7 @@
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          urcuversion: !!python/tuple [stable-0.12]
+          urcuversion: !!python/tuple [stable-0.13]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
           filter: ''