X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=3fa5bfb4088e4c28d8723e1e57c23590672a94c0;hb=23ebcd4b370980c414eee8837d5351a64e41221f;hp=3b130592080063b3f4db4a61d6852d679c023642;hpb=1b7b4b3547c6fcf1069d93a474e1ae5559edc1b4;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 3b13059..3fa5bfb 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -622,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:
@@ -646,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:
@@ -684,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
@@ -1075,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
@@ -1205,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
@@ -1325,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
@@ -1694,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
@@ -1748,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
@@ -1780,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