X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=7980737230cf42b155ff15e7df51f7f50cc0fa85;hb=0f505d219b18486117161b94ba624b66f435c62b;hp=c8dbdb830e2678a8eeb80380e00006f8cf0e5afb;hpb=51c9c62db1805a4cdd96be18df4082f1ac5d81c5;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index c8dbdb8..7980737 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -64,6 +64,26 @@
          name: build
          values: '{obj:build}'
 
+- lttng-ust_build_axes_gerrit_lttng-tools: &lttng-ust_build_axes_gerrit_lttng-tools
+    name: 'lttng-ust_build_axes_gerrit_lttng-tools'
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    execution-strategy:
+      combination-filter: '{filter}'
+    axes:
+      - axis:
+         type: slave
+         name: arch
+         values: '{obj:arch}'
+      - axis:
+         type: user-defined
+         name: conf
+         values: '{obj:conf}'
+      - axis:
+         type: user-defined
+         name: build
+         values: '{obj:build}'
+
 - lttng-ust_build_builders_defaults: &lttng-ust_build_builders_defaults
     name: 'lttng-ust_build_builders_defaults'
     builders:
@@ -74,7 +94,7 @@
           on-evaluation-failure: run
           steps:
             - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std
+                project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std'
                 which-build: last-successful
                 stable: false
                 filter: 'build/**'
@@ -88,7 +108,7 @@
           on-evaluation-failure: run
           steps:
             - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=debug-rcu,build=std
+                project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=debug-rcu,build=std'
                 which-build: last-successful
                 stable: false
                 filter: 'build/**'
@@ -101,7 +121,7 @@
           on-evaluation-failure: run
           steps:
             - copyartifact:
-                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=tls_fallback,build=std
+                project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=tls_fallback,build=std'
                 which-build: last-successful
                 stable: false
                 filter: 'build/**'
@@ -112,16 +132,93 @@
            - 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: strings-match
+          condition-string1: '$GERRIT_BRANCH'
+          condition-string2: master
+          on-evaluation-failure: run
+          steps:
+            - inject:
+                properties-content: liburcu_version=master
+      - conditional-step:
+          condition-kind: not
+          on-evaluation-failure: run
+          condition-operand:
+              condition-kind: strings-match
+              condition-string1: '$GERRIT_BRANCH'
+              condition-string2: master
+          steps:
+            - inject:
+                 properties-content: 'liburcu_version={liburcu_version}'
 
-## Templates
-- job-template:
-    name: lttng-ust_{version}_{buildtype}
-    defaults: lttng-ust
+      - 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
 
-    <<: *lttng-ust_build_axes_defaults
-    <<: *lttng-ust_build_builders_defaults
+      - 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
 
-    # TODO: Scan for open tasks
+      - shell:
+         !include-raw-escape:
+           - scripts/lttng-ust/gerrit-checkout-tools.sh
+      - 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
+
+- lttng-ust_build_publishers_defaults: &lttng-ust_build_publishers_defaults
+    name: 'lttng-ust_build_publishers_defaults'
     publishers:
       - tap:
           results: 'tap/**/*.log'
@@ -164,6 +261,25 @@
           send-to:
             - recipients
 
+
+## Templates
+- job-template:
+    name: lttng-ust_{version}_{buildtype}
+    defaults: lttng-ust
+
+    <<: *lttng-ust_build_axes_defaults
+    <<: *lttng-ust_build_builders_defaults
+    <<: *lttng-ust_build_publishers_defaults
+
+
+- job-template:
+    name: '{job_prefix}lttng-ust_{version}_{buildtype}'
+    defaults: lttng-ust
+
+    <<: *lttng-ust_build_axes_defaults
+    <<: *lttng-ust_build_builders_defaults
+    <<: *lttng-ust_build_publishers_defaults
+
 - job-template:
     name: dev_gerrit_lttng-ust_{buildtype}
     defaults: lttng-ust
@@ -225,6 +341,67 @@
           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
+
+    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_gerrit_lttng-tools
+    <<: *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
@@ -323,83 +500,97 @@
 ## Projects
 - project:
     name: lttng-ust
+    job_prefix: ''
+    urcu_job_prefix: ''
     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, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
-          filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))'
+          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}_cppcheck'
-      - 'lttng-ust_{version}_scan-build'
+      - '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':
+          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, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.12, master]
-          filter: '(build=="std") || ((liburcu_version=="master" && (conf=="std" || conf=="agents")))'
+          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}':
@@ -408,7 +599,7 @@
           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.12, master]
+          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
@@ -416,15 +607,15 @@
           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
@@ -432,36 +623,95 @@
           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 ##
-      - 'lttng-ust_{version}_{buildtype}':
+
+- project:
+    name: lttng-ust-dev-upstream
+    job_prefix: dev_upstream_
+    urcu_job_prefix: 'dev_upstream_'
+    github_user: lttng
+    github_name: lttng-ust
+    email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
+    jobs:
+      ## Stable 2.11 ##
+      - '{job_prefix}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.11]
+          filter: '(build=="std") || (conf=="std" || conf=="agents")'
+      - '{job_prefix}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 [agents]
+          liburcu_version: !!python/tuple [stable-0.11]
+          filter: ''
+      - '{job_prefix}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.11]
+          filter: ''
+      - '{job_prefix}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.11]
           filter: ''
 
-      ## Stable 2.8 ##
-      - 'lttng-ust_{version}_{buildtype}':
+      ## Stable 2.10 ##
+      - '{job_prefix}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]
+          filter: '(build=="std") || (conf=="std" || conf=="agents")'
+      - '{job_prefix}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 [agents]
+          liburcu_version: !!python/tuple [stable-0.9]
+          filter: ''
+      - '{job_prefix}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]
+          filter: ''
+      - '{job_prefix}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]
           filter: ''
 
 
 - project:
     name: gerrit-lttng-ust
+    job_prefix: ''
+    urcu_job_prefix: ''
     github_user: lttng
     github_name: lttng-ust
     jobs:
@@ -470,14 +720,29 @@
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.12]
+          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: '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.12]
+          liburcu_version: !!python/tuple [stable-0.13]
+          filter: ''
+      - 'dev_gerrit_lttng-ust_{buildtype}':
+          buildtype: freebsdbuild
+          arch: !!python/tuple [freebsd]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          liburcu_version: !!python/tuple [stable-0.13]
           filter: ''
 
 - project: