X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=6f0359225f6f344490467b25b45d35dab3ef3315;hb=ed7ece9a6404fea1a39a33c1ad0cda42a174979b;hp=5ad412e044010e7aa7b4ad3d36123730329a52b7;hpb=1f88437d0a7c5ef585e9775c22e4985b8fd1c0b6;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 5ad412e..6f03592 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -154,12 +154,15 @@
               ust_conf=std
               ;;
           esac
-          # Run java tests only on 'linuxbuild' jobs
-          if [ "{buildtype}" = "linuxbuild" ]; then
+          # Run java tests only on 'linuxbuild' and 'slesbuild' jobs
+          if [ "{buildtype}" = "linuxbuild" ] || [ "{buildtype}" = "slesbuild" ]; then
             echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=yes" >> env.properties
           else
             echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=no" >> env.properties
           fi
+          if [ "{buildtype}" = "slesbuild" ] ; then
+            echo "TAP_AUTOTIME=0" >> env.properties
+          fi
           echo "liburcu_conf=$liburcu_conf" >> env.properties
           echo "babeltrace_conf=$babeltrace_conf" >> env.properties
           echo "ust_conf=$ust_conf" >> env.properties
@@ -212,6 +215,20 @@
 - _lttng-tools_builders_review: &lttng-tools_builders_review
     name: 'lttng-tools_builders_review'
     builders:
+      - shell: |
+          #!/bin/bash
+          set -exu
+          # Run java tests only on 'linuxbuild' and 'slesbuild' jobs
+          if [ "{buildtype}" = "linuxbuild" ] || [ "{buildtype}" = "slesbuild" ]; then
+            echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=yes" >> env.properties
+          else
+            echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=no" >> env.properties
+          fi
+          if [ "{buildtype}" = "slesbuild" ] ; then
+            echo "TAP_AUTOTIME=0" >> env.properties
+          fi
+      - inject:
+          properties-file: env.properties
       - shell:
          !include-raw-escape: scripts/lttng-tools/gerrit-depends-on.sh
 
@@ -401,6 +418,7 @@
           include-comment-diagnostics: true
           output-tap-to-console: false
           todo-is-failure: false
+          remove-yaml-if-corrupted: true
 
       - raw: &lttng-tools_publisher_warnings-ng_defaults
           xml: |
@@ -1099,7 +1117,7 @@
           buildtype: yoctobuild
           version: master
           ustversion: master
-          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto40-powerpc, yocto40-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [master]
@@ -1218,7 +1236,7 @@
           buildtype: yoctobuild
           version: stable-2.13
           ustversion: stable-2.13
-          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto40-powerpc, yocto40-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1327,7 +1345,7 @@
           buildtype: yoctobuild
           version: stable-2.12
           ustversion: stable-2.12
-          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto40-powerpc, yocto40-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1499,6 +1517,17 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
+      - 'dev_review_lttng-tools_{version}_{buildtype}':
+          version: master
+          buildtype: slesbuild
+          ustversion: master
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          urcuversions: !!python/tuple [master]
+          babelversions: !!python/tuple [stable-2.0]
+          filter: ''
+          touchstone: ''
       - 'dev_review_lttng-tools_{version}_rootbuild':
           version: master
           buildtype: linuxbuild