jjb: Update regex match for lttng-modules detection on dev_review jobs

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

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 06c6a538dd586ecb75205bbf32e93d320558c7d0..f32ce045c6a118cb1f7ed2251827482da365520d 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -163,6 +163,7 @@
           fi
           if [ "{buildtype}" = "slesbuild" ] ; then
             echo "TAP_AUTOTIME=0" >> env.properties
+            echo "LTTNG_TESTS_TAP_AUTOTIME=0" >> env.properties
             # On SLES, force log4j to 2.17.1
             echo "LTTNG_TOOLS_UST_JAVA_TESTS_LOG4J_API_VERSION=2.17.1" >> env.properties
           fi
@@ -229,6 +230,7 @@
           fi
           if [ "{buildtype}" = "slesbuild" ] ; then
             echo "TAP_AUTOTIME=0" >> env.properties
+            echo "LTTNG_TESTS_TAP_AUTOTIME=0" >> env.properties
           fi
       - inject:
           properties-file: env.properties
@@ -242,7 +244,7 @@
       - conditional-step:
           condition-kind: regex-match
           label: '$JOB_NAME'
-          regex: '.*_rootbuild.*'
+          regex: '.*_root(?:_[a-z]+)?build.*'
           steps:
             - shell: |
                 #!/bin/bash
@@ -1052,6 +1054,9 @@
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
           project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
+      - copyartifact:
+          <<: *lttng-tools_steps_copyartifact_defaults
+          project: 'babeltrace_{babelversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
           project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std'
@@ -1089,6 +1094,9 @@
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
           project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
+      - copyartifact:
+          <<: *lttng-tools_steps_copyartifact_defaults
+          project: 'babeltrace_{babelversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
           project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std'
@@ -1260,10 +1268,12 @@
           version: master
           urcuversion: master
           ustversion: master
+          babelversion: master
       - 'lttng-tools_{version}_coverity':
           version: master
           urcuversion: master
           ustversion: master
+          babelversion: master
 
       # stable-2.13
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
@@ -1395,6 +1405,7 @@
           version: stable-2.13
           urcuversion: stable-0.13
           ustversion: stable-2.13
+          babelversion: stable-2.0
 
       # stable-2.12
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
@@ -1526,6 +1537,7 @@
           version: stable-2.12
           urcuversion: stable-0.13
           ustversion: stable-2.12
+          babelversion: stable-2.0
 
 - project:
     name: dev_jgalar_lttng-tools