X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=c8dbdb830e2678a8eeb80380e00006f8cf0e5afb;hb=51c9c62db1805a4cdd96be18df4082f1ac5d81c5;hp=3da74c1afbf59ad5513e819ecfd431c8f9637c7e;hpb=0104d1467c57eb16b2ae852e8c5acec817a0b064;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 3da74c1..c8dbdb8 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -17,7 +17,7 @@
 
     scm:
       - git:
-          url: git://github.com/{github_user}/{github_name}.git
+          url: https://github.com/{github_user}/{github_name}.git
           browser: githubweb
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
@@ -94,8 +94,23 @@
                 filter: 'build/**'
                 target: 'deps'
                 do-not-fingerprint: true
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: (tls_fallback)
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=tls_fallback,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps'
+                do-not-fingerprint: true
       - shell:
-         !include-raw-escape: scripts/lttng-ust/build.sh
+         !include-raw-escape:
+           - scripts/common/print.sh
+           - scripts/lttng-ust/build.sh
 
 
 ## Templates
@@ -175,7 +190,6 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
-          trigger-for-unreviewed-patches: true
 
     <<: *lttng-ust_build_axes_defaults
     <<: *lttng-ust_build_builders_defaults
@@ -320,9 +334,9 @@
           buildtype: build
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu]
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
-          filter: '(build=="std") || (liburcu_version=="master")'
+          filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
@@ -334,7 +348,7 @@
           buildtype: slesbuild
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
@@ -353,9 +367,9 @@
           version: master
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu]
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
           liburcu_version: !!python/tuple [stable-0.12, master]
-          filter: '(build=="std") || (liburcu_version=="master")'
+          filter: '(build=="std") || ((liburcu_version=="master" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: master
@@ -369,7 +383,7 @@
           version: master
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.12, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
@@ -393,9 +407,9 @@
           version: stable-2.12
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu]
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
           liburcu_version: !!python/tuple [stable-0.12, master]
-          filter: '(build=="std") || (liburcu_version=="stable-0.12")'
+          filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.12
@@ -409,7 +423,7 @@
           version: stable-2.12
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.12, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
@@ -431,7 +445,7 @@
           version: stable-2.9
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: ''
 
@@ -441,7 +455,7 @@
           version: stable-2.8
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: ''
 
@@ -457,7 +471,14 @@
           build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, agents]
           liburcu_version: !!python/tuple [stable-0.12]
-          filter: '(build=="std" && conf=="std") || (arch=="amd64")'
+          filter: ''
+      - 'dev_gerrit_lttng-ust_{buildtype}':
+          buildtype: portbuild
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          liburcu_version: !!python/tuple [stable-0.12]
+          filter: ''
 
 - project:
     name: lttng-ust-views