X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=65b8e08d6b895acbcb249e4df8de95f7718d395c;hb=c72041ebe744c7c3fd8411fafd93abe46292bff4;hp=8c15e7d00dc0e3522a839d7e86d8e5e0c856de8a;hpb=8e088f796d5d87d24aa8ff890f122290758cd343;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 8c15e7d..65b8e08 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -316,13 +316,6 @@
          !include-raw-escape: scripts/lttng-tools/gerrit-depends-on.sh
       - inject:
           properties-file: gerrit_custom_dependencies.properties
-      - copyartifact:
-              project: '{bt_job_prefix}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
@@ -352,6 +345,18 @@
                 filter: 'build/**'
                 target: 'deps'
                 do-not-fingerprint: true
+      - conditional-step:
+          condition-kind: shell
+          on-evaluation-failure: run
+          condition-command: 'test -z "$GERRIT_DEP_BABELTRACE"'
+          steps:
+            - copyartifact:
+                project: '{bt_job_prefix}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:
@@ -363,6 +368,15 @@
                    - scripts/common/override-build-std.sh
                    - scripts/common/print.sh
                    - scripts/liburcu/build.sh
+      - conditional-step:
+          condition-kind: shell
+          condition-command: 'test ! -z "$GERRIT_DEP_BABELTRACE"'
+          steps:
+            - shell:
+               !include-raw-escape:
+                   - scripts/common/override-build-std.sh
+                   - scripts/common/print.sh
+                   - scripts/babeltrace/build.sh
       - shell:
          !include-raw-escape: scripts/lttng-tools/gerrit-install-deps.sh
       - conditional-step:
@@ -1267,10 +1281,6 @@
           version: stable-2.13
           urcuversion: stable-0.13
           ustversion: stable-2.13
-      - 'lttng-tools_{version}_coverity':
-          version: stable-2.13
-          urcuversion: stable-0.13
-          ustversion: stable-2.13
 
       # stable-2.12
       - 'lttng-tools_{version}_{buildtype}':
@@ -1369,10 +1379,6 @@
           version: stable-2.12
           urcuversion: stable-0.12
           ustversion: stable-2.12
-      - 'lttng-tools_{version}_coverity':
-          version: stable-2.12
-          urcuversion: stable-0.12
-          ustversion: stable-2.12
 
       # Other jobs
       - 'lttng-tools_{version}_cppcheck'