X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=jobs%2Flttng-ust.yaml;h=d1f2130e6152943962bff6945f588fd7321c2171;hb=c8370e00c5b20d4889864bcee792fa7005805cea;hp=b880469ed8969ea22942d341ef3437215a6ca740;hpb=3579dc143a3efb98fd0f0a667b52920f62a73523;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index b880469..d1f2130 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -39,16 +39,13 @@
           url: https://github.com/{github_user}/{github_name}
 
 
-## Templates
-- job-template:
-    name: lttng-ust_{version}_{buildtype}
-    defaults: lttng-ust
-
+## Anchors
+- lttng-ust_build_axes_defaults: &lttng-ust_build_axes_defaults
+    name: 'lttng-ust_build_axes_defaults'
     project-type: matrix
     node: 'master' # Applies only to matrix flyweight task
     execution-strategy:
-      combination-filter: |
-        (build=="std") || (liburcu_version=="master")
+      combination-filter: '{filter}'
     axes:
       - axis:
          type: slave
@@ -67,6 +64,8 @@
          name: build
          values: '{obj:build}'
 
+- lttng-ust_build_builders_defaults: &lttng-ust_build_builders_defaults
+    name: 'lttng-ust_build_builders_defaults'
     builders:
       - conditional-step:
           condition-kind: regex-match
@@ -98,10 +97,20 @@
       - shell:
          !include-raw-escape: scripts/lttng-ust/build.sh
 
+
+## Templates
+- job-template:
+    name: lttng-ust_{version}_{buildtype}
+    defaults: lttng-ust
+
+    <<: *lttng-ust_build_axes_defaults
+    <<: *lttng-ust_build_builders_defaults
+
     # TODO: Scan for open tasks
     publishers:
       - tap:
           results: 'tap/**/*.log'
+          fail-if-no-results: true
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -140,6 +149,68 @@
           send-to:
             - recipients
 
+- job-template:
+    name: dev_gerrit_lttng-ust_{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: '**'
+          trigger-for-unreviewed-patches: true
+
+    <<: *lttng-ust_build_axes_defaults
+    <<: *lttng-ust_build_builders_defaults
+
+    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
@@ -179,7 +250,7 @@
           which-build: last-successful
           stable: false
           filter: 'build/**'
-          target: 'deps/liburcu'
+          target: 'deps'
           do-not-fingerprint: true
       - shell:
           !include-raw-escape: scripts/common/scan-build.sh
@@ -216,7 +287,7 @@
           which-build: last-successful
           stable: false
           filter: 'build/**'
-          target: 'deps/liburcu'
+          target: 'deps'
           do-not-fingerprint: true
       - shell:
           !include-raw-escape: scripts/common/coverity.sh
@@ -242,8 +313,6 @@
     github_name: lttng-ust
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
     version:
-      - stable-2.8
-      - stable-2.9
       - stable-2.10
       - stable-2.11
     jobs:
@@ -252,42 +321,65 @@
           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.8, stable-0.9, stable-0.10, stable-0.11, master]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          filter: '(build=="std") || (liburcu_version=="master")'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, stable-0.11, master]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           arch: !!python/tuple [sles12sp2]
           build: !!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}':
+          buildtype: elbuild
+          arch: !!python/tuple [el8]
+          build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.11, master]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          filter: ''
       - 'lttng-ust_{version}_cppcheck'
       - 'lttng-ust_{version}_scan-build'
+
+      ## 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.11, master]
+          liburcu_version: !!python/tuple [stable-0.12, master]
+          filter: '(build=="std") || (liburcu_version=="master")'
       - '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.11, master]
+          liburcu_version: !!python/tuple [stable-0.12, master]
+          filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: master
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          liburcu_version: !!python/tuple [stable-0.12, 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.11, master]
+          liburcu_version: !!python/tuple [stable-0.12, master]
+          filter: ''
       - 'lttng-ust_{version}_cppcheck':
           version: master
       - 'lttng-ust_{version}_scan-build':
@@ -295,16 +387,86 @@
       - 'lttng-ust_{version}_coverity':
           version: master
 
-      # stable-2.7
+      ## Stable 2.12 ##
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: build
+          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")'
+      - '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]
+          filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          version: stable-2.7
+          version: stable-2.12
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          liburcu_version: !!python/tuple [stable-0.12, master]
+          filter: ''
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: elbuild
+          version: stable-2.12
+          arch: !!python/tuple [el8]
+          build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.9]
+          liburcu_version: !!python/tuple [stable-0.12, 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}':
+          buildtype: slesbuild
+          version: stable-2.9
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          filter: ''
+
+      ## Stable 2.8 ##
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: stable-2.8
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          filter: ''
+
+
+- project:
+    name: gerrit-lttng-ust
+    github_user: lttng
+    github_name: lttng-ust
+    jobs:
+      - 'dev_gerrit_lttng-ust_{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.12]
+          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: liburcu-views
+    name: lttng-ust-views
     views:
       - LTTng-ust