jjb: lttng-tools: rename TAP_AUTOTIME to LTTNG_TESTS_TAP_AUTOTIME

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

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 72768f121ae086b953379a1d77def124ad8fcf89..a980b8d34048d706a6fd1a8a74dd3c02d5447e88 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
@@ -1231,6 +1236,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
@@ -1361,6 +1377,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
@@ -1481,6 +1508,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