jjb: lttng-modules: disable -Werror for kernel builds

[lttng-ci.git] / jobs / lttng-tools.yaml

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 295b383abb8dd8ff2edb9bf31256680befdd4e06..65b8e08d6b895acbcb249e4df8de95f7718d395c 100644 (file)
--- 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: