X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=de4e753492082face50b2ba54c19817180f1c7b9;hb=7a97936af7e4f1915c81af3d175d0bf6cb652a86;hp=054dff1b35e5dac8e8f25999e373fb11e2700059;hpb=60bb9bdeceec4073ddd5be4e2ddbff036894fa15;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 054dff1..de4e753 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,9 +94,86 @@
                 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
 
+- lttng-ust_build_builders_gerrit_lttng-tools: &lttng-ust_build_builders_gerrit_lttng-tools
+    name: 'lttng-ust_build_builders_gerrit_lttng-tools'
+    builders:
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: (std|agents)
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps'
+                do-not-fingerprint: true
+
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: (debug-rcu)
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=debug-rcu,build=std
+                which-build: last-successful
+                stable: false
+                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
+      - copyartifact:
+          project: babeltrace_{babeltrace_version}_{buildtype}/arch=${{arch}},conf=std,build=std
+          which-build: last-successful
+          stable: false
+          filter: 'build/**'
+          target: 'deps'
+          do-not-fingerprint: true
+
+      - shell:
+         !include-raw-escape:
+           - scripts/common/print.sh
+           - scripts/lttng-ust/build.sh
+      - shell:
+         !include-raw-escape:
+           - scripts/lttng-tools/gerrit-install-deps.sh
+      - shell:
+         !include-raw-escape:
+           - scripts/common/print.sh
+           - scripts/lttng-tools/build.sh
 
 ## Templates
 - job-template:
@@ -175,7 +252,6 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
-          trigger-for-unreviewed-patches: true
 
     <<: *lttng-ust_build_axes_defaults
     <<: *lttng-ust_build_builders_defaults
@@ -211,6 +287,73 @@
           allow-empty: false
       - workspace-cleanup
 
+- job-template:
+    name: dev_gerrit_lttng-ust_lttng-tools_{buildtype}
+    defaults: lttng-ust
+    concurrent: true
+
+    scm:
+      - git:
+          url: https://review.lttng.org/lttng-ust
+          refspec: 'refs/changes/*:refs/changes/*'
+          branches:
+            - '$GERRIT_REFSPEC'
+          basedir: src/lttng-ust
+          skip-tag: true
+      - git:
+          url: https://review.lttng.org/lttng-tools
+          branches:
+            - '$GERRIT_BRANCH'
+          basedir: src/lttng-tools
+          skip-tag: true
+
+    triggers:
+      - gerrit:
+          trigger-on:
+            - comment-added-event:
+                approval-category: 'CI-Build'
+                approval-value: 1
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'lttng-ust'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**'
+
+    <<: *lttng-ust_build_axes_defaults
+    <<: *lttng-ust_build_builders_gerrit_lttng-tools
+
+    properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=lttng-ust
+      - build-discarder:
+          days-to-keep: 1
+      - throttle:
+          option: 'category'
+          categories:
+            - 'gerrit-{buildtype}'
+
+    publishers:
+      - tap:
+          results: 'tap/**/*.log'
+          fail-if-no-results: true
+          failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
+      - warnings:
+          console-log-parsers:
+            - 'GNU Make + GNU C Compiler (gcc)'
+          total-thresholds:
+            failed:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+      - archive:
+          artifacts: 'build/**,tap/**'
+          allow-empty: false
+      - workspace-cleanup
+
 - job-template:
     name: lttng-ust_{version}_cppcheck
     defaults: lttng-ust
@@ -312,80 +455,92 @@
     github_user: lttng
     github_name: lttng-ust
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
-    version:
-      - stable-2.10
-      - stable-2.11
     jobs:
+      ## Master ##
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
+          version: master
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
-          filter: '(build=="std") || (liburcu_version=="master")'
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_version: !!python/tuple [stable-0.13, master]
+          filter: '(build=="std") || ((liburcu_version=="master" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
+          version: master
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          arch: !!python/tuple [sles12sp2]
+          version: master
+          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]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
+          version: master
           arch: !!python/tuple [el8]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, 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.13, master]
           filter: ''
-      - 'lttng-ust_{version}_cppcheck'
-      - 'lttng-ust_{version}_scan-build'
+      - 'lttng-ust_{version}_cppcheck':
+          version: master
+      - 'lttng-ust_{version}_scan-build':
+          version: master
+      - 'lttng-ust_{version}_coverity':
+          version: master
 
-      ## Master ##
+      ## Stable 2.13 ##
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
-          version: master
+          version: stable-2.13
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu]
-          liburcu_version: !!python/tuple [stable-0.12, master]
-          filter: '(build=="std") || (liburcu_version=="master")'
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_version: !!python/tuple [stable-0.13, master]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
-          version: master
+          version: stable-2.13
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          version: master
-          arch: !!python/tuple [sles12sp2]
+          version: stable-2.13
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
-          version: master
+          version: stable-2.13
           arch: !!python/tuple [el8]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_cppcheck':
-          version: master
+          version: stable-2.13
       - 'lttng-ust_{version}_scan-build':
-          version: master
-      - 'lttng-ust_{version}_coverity':
-          version: master
+          version: stable-2.13
 
       ## Stable 2.12 ##
       - 'lttng-ust_{version}_{buildtype}':
@@ -393,24 +548,24 @@
           version: stable-2.12
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu]
-          liburcu_version: !!python/tuple [stable-0.12, master]
-          filter: '(build=="std") || (liburcu_version=="stable-0.12")'
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.12
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
       - '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]
+          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
@@ -418,31 +573,83 @@
           arch: !!python/tuple [el8]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_cppcheck':
           version: stable-2.12
       - 'lttng-ust_{version}_scan-build':
           version: stable-2.12
 
-      ## Stable 2.9 ##
+      ## Stable 2.11 ##
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: build
+          version: stable-2.11
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.13, master]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: portbuild
+          version: stable-2.11
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.13, master]
+          filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          version: stable-2.9
-          arch: !!python/tuple [sles12sp2]
+          version: stable-2.11
+          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]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.13, master]
+          filter: ''
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: elbuild
+          version: stable-2.11
+          arch: !!python/tuple [el8]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.13, master]
           filter: ''
+      - 'lttng-ust_{version}_cppcheck':
+          version: stable-2.11
+      - 'lttng-ust_{version}_scan-build':
+          version: stable-2.11
 
-      ## Stable 2.8 ##
+      ## Stable 2.10 ##
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: build
+          version: stable-2.10
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.12]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: portbuild
+          version: stable-2.10
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.12]
+          filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          version: stable-2.8
-          arch: !!python/tuple [sles12sp2]
+          version: stable-2.10
+          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]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.12]
+          filter: ''
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: elbuild
+          version: stable-2.10
+          arch: !!python/tuple [el8]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.12]
           filter: ''
 
 
@@ -456,8 +663,24 @@
           arch: !!python/tuple [amd64]
           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")'
+          liburcu_version: !!python/tuple [stable-0.13]
+          filter: ''
+      - 'dev_gerrit_lttng-ust_lttng-tools_{buildtype}':
+          buildtype: build
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, oot, dist, oot-dist]
+          conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.13]
+          filter: ''
+          babeltrace_version: stable-2.0
+
+      - '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.13]
+          filter: ''
 
 - project:
     name: lttng-ust-views