X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=029f147d6863a42f90ebb92beda97ba723dba116;hb=3b9bb48d192c642d57f678220c236ede3814ddb1;hp=d1f2130e6152943962bff6945f588fd7321c2171;hpb=c8370e00c5b20d4889864bcee792fa7005805cea;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index d1f2130..029f147 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]
@@ -332,7 +346,7 @@
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
@@ -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
@@ -367,7 +381,7 @@
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: master
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.12, master]
@@ -380,6 +394,14 @@
           conf: !!python/tuple [std]
           liburcu_version: !!python/tuple [stable-0.12, master]
           filter: ''
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: freebsdbuild
+          version: master
+          arch: !!python/tuple [freebsd]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          liburcu_version: !!python/tuple [stable-0.12, master]
+          filter: ''
       - 'lttng-ust_{version}_cppcheck':
           version: master
       - 'lttng-ust_{version}_scan-build':
@@ -393,9 +415,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
@@ -407,7 +429,7 @@
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.12
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.12, master]
@@ -429,7 +451,7 @@
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.9
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
@@ -439,7 +461,7 @@
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.8
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]