X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=3fa5bfb4088e4c28d8723e1e57c23590672a94c0;hb=d5ff1878970cb321c34b81e755c1c50970e75ebd;hp=5c97d7325c3e95653d14684f0ab0040b5a663cb8;hpb=40497a50d8f2bd728bc4491ecab0cb793c1004c0;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 5c97d73..3fa5bfb 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -154,6 +154,10 @@
               ust_conf=std
               ;;
           esac
+          # Run java tests only on 'linuxbuild' jobs
+          if [ "{buildtype}" = "linuxbuild" ]; then
+            echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=yes" >> env.properties
+          fi
           echo "liburcu_conf=$liburcu_conf" >> env.properties
           echo "babeltrace_conf=$babeltrace_conf" >> env.properties
           echo "ust_conf=$ust_conf" >> env.properties
@@ -618,7 +622,7 @@
     triggers:
       - pollscm: *lttng-tools_trigger_pollscm_default
       - reverse:
-            jobs: '{ust_job_prefix}lttng-ust_{version}_build'
+            jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}'
             result: 'success'
 
 - job-template:
@@ -642,7 +646,7 @@
     triggers:
       - pollscm: *lttng-tools_trigger_pollscm_default
       - reverse:
-            jobs: '{ust_job_prefix}lttng-ust_{version}_build'
+            jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}'
             result: 'success'
 
 - job-template:
@@ -680,6 +684,9 @@
             - '$GERRIT_REFSPEC'
           basedir: src/lttng-tools
           skip-tag: true
+          # Work-around for hangs while cloning lttng-tools from gerrit
+          # @see https://support.efficios.com/issues/1532
+          git-tool: jgit
 
     triggers:
       - gerrit: &lttng-tools_trigger_gerrit_default
@@ -1071,17 +1078,6 @@
           babelversions: !!python/tuple [stable-2.0, master]
           filter: '(build=="std") || ((babeltrace_version=="master" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: master
-          ustversion: master
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [master]
-          babelversions: !!python/tuple [stable-2.0, master]
-          filter: '(build=="std") || ((babeltrace_version=="master" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: master
@@ -1201,17 +1197,6 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.13
-          ustversion: stable-2.13
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.13
@@ -1321,17 +1306,6 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.12
-          ustversion: stable-2.12
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.12
@@ -1417,7 +1391,7 @@
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
+          filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")'
           touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.12
@@ -1690,16 +1664,6 @@
     github_user: lttng
     jobs:
     ## Master ##
-      - 'dev_review_lttng-tools_{version}_{buildtype}':
-          version: master
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support
-          babelversions: !!python/tuple [stable-2.0]
-          filter: ''
-          touchstone: ''
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: master
           buildtype: linuxbuild
@@ -1744,16 +1708,6 @@
           version: master
 
     ## Stable 2.13 ##
-      - 'dev_review_lttng-tools_{version}_{buildtype}':
-          version: stable-2.13
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: ''
-          touchstone: ''
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: stable-2.13
           buildtype: linuxbuild
@@ -1776,16 +1730,6 @@
           touchstone: ''
 
     ## Stable 2.12 ##
-      - 'dev_review_lttng-tools_{version}_{buildtype}':
-          version: stable-2.12
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: ''
-          touchstone: ''
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: stable-2.12
           buildtype: linuxbuild
@@ -1804,7 +1748,7 @@
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
+          filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")'
           touchstone: ''
 
 - project: