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 72768f121ae086b953379a1d77def124ad8fcf89..f32ce045c6a118cb1f7ed2251827482da365520d 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -112,9 +112,10 @@
          type: slave
          name: node
          values:
-           - 'sles15sp4-amd64-rootnode'
            - 'amd64-rootnode'
+           - 'el8-amd64-rootnode'
            - 'i386-rootnode'
+           - 'sles15sp4-amd64-rootnode'
       - axis:
           <<: *lttng-tools_matrix_axis_platform
           type: user-defined
@@ -162,6 +163,9 @@
           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
           echo "liburcu_conf=$liburcu_conf" >> env.properties
           echo "babeltrace_conf=$babeltrace_conf" >> env.properties
@@ -226,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
@@ -239,7 +244,7 @@
       - conditional-step:
           condition-kind: regex-match
           label: '$JOB_NAME'
-          regex: '.*_rootbuild.*'
+          regex: '.*_root(?:_[a-z]+)?build.*'
           steps:
             - shell: |
                 #!/bin/bash
@@ -1049,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'
@@ -1086,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'
@@ -1231,6 +1242,17 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: '(node=="sles15sp4-amd64-rootnode" && platform=="sles15sp4-amd64")'
           touchstone: ''
+      - '{job_prefix}lttng-tools_{version}_root_{buildtype}':
+          buildtype: elbuild
+          version: master
+          ustversion: master
+          platforms: !!python/tuple [el8-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          urcuversions: !!python/tuple [master]
+          babelversions: !!python/tuple [stable-2.0]
+          filter: '(node=="el8-amd64-rootnode" && platform=="el8-amd64")'
+          touchstone: ''
       - '{job_prefix}lttng-tools_{version}_rootbuild_i386':
           buildtype: portbuild
           version: master
@@ -1246,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}':
@@ -1361,6 +1385,17 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: '(node=="sles15sp4-amd64-rootnode" && platform=="sles15sp4-amd64")'
           touchstone: ''
+      - '{job_prefix}lttng-tools_{version}_root_{buildtype}':
+          buildtype: elbuild
+          version: stable-2.13
+          ustversion: stable-2.13
+          platforms: !!python/tuple [el8-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          urcuversions: !!python/tuple [stable-0.13]
+          babelversions: !!python/tuple [stable-2.0]
+          filter: '(node=="el8-amd64-rootnode" && platform=="el8-amd64")'
+          touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.13
           ustversion: stable-2.13
@@ -1370,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}':
@@ -1481,6 +1517,17 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: '(node=="sles15sp4-amd64-rootnode" && platform=="sles15sp4-amd64")'
           touchstone: ''
+      - '{job_prefix}lttng-tools_{version}_root_{buildtype}':
+          buildtype: elbuild
+          version: stable-2.12
+          ustversion: stable-2.12
+          platforms: !!python/tuple [el8-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          urcuversions: !!python/tuple [stable-0.13]
+          babelversions: !!python/tuple [stable-2.0]
+          filter: '(node=="el8-amd64-rootnode" && platform=="el8-amd64")'
+          touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.12
           ustversion: stable-2.12
@@ -1490,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