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

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index d805afc..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:
@@ -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
@@ -79,7 +78,7 @@
                 which-build: last-successful
                 stable: false
                 filter: 'build/**'
-                target: 'deps/liburcu'
+                target: 'deps'
                 do-not-fingerprint: true
 
       - conditional-step:
@@ -93,15 +92,40 @@
                 which-build: last-successful
                 stable: false
                 filter: 'build/**'
-                target: 'deps/liburcu'
+                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
+- 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:
@@ -114,7 +138,7 @@
               total-normal: 0
               total-low: 0
       - archive:
-          artifacts: 'build/**'
+          artifacts: 'build/**,tap/**'
           allow-empty: false
       - workspace-cleanup
       - email-ext:
@@ -140,6 +164,67 @@
           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: '**'
+
+    <<: *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
@@ -167,7 +252,7 @@
 - job-template:
     name: lttng-ust_{version}_scan-build
     defaults: lttng-ust
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -175,11 +260,11 @@
 
     builders:
       - copyartifact:
-          project: liburcu_master_build/arch=x86-64,conf=std,build=std
+          project: liburcu_master_build/arch=amd64,conf=std,build=std
           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
@@ -193,7 +278,7 @@
 - job-template:
     name: lttng-ust_{version}_coverity
     defaults: lttng-ust
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -212,11 +297,11 @@
 
     builders:
       - copyartifact:
-          project: liburcu_master_build/arch=x86-64,conf=std,build=std
+          project: liburcu_master_build/arch=amd64,conf=std,build=std
           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
@@ -227,119 +312,88 @@
           artifacts: 'analysis-results.tgz,cov-int/**'
           allow-empty: false
 
-# TODO
-- job-template:
-    name: lttng-ust_{version}_pylint
-    defaults: lttng-ust
-    node: 'x86-64'
-
-    scm: []
 
-    triggers:
-      - pollscm:
-          cron: "@daily"
+## Views
+- view-template:
+    name: 'LTTng-ust'
+    view-type: list
+    regex: 'lttng-ust[-_].*'
 
-    builders:
-       - copyartifact:
-           project: lttng-ust-{version}/arch=x86-64,build=std,conf=agents
-           which-build: last-successful
-           stable: false
-           filter: 'build/**'
-           target: 'deps/lttng-ust'
-           do-not-fingerprint: true
-       - shell:
-          !include-raw-escape: scripts/lttng-ust/pylint.sh
 
-    publishers:
-      - archive:
-          artifacts: 'pep8.out,pylint.out'
-      - violations:
-          pep8:
-            pattern: pep8.out
-            min: 10
-            max: 999
-            unstable: 999
-          pylint:
-            pattern: pylint.out
-            min: 10
-            max: 999
-            unstable: 999
-      - email-ext:
-          recipients: '{obj:email_to}'
-          always: false
-          unstable: false
-          first-failure: true
-          first-unstable: true
-          not-built: false
-          aborted: false
-          regression: false
-          failure: false
-          second-failure: false
-          improvement: false
-          still-failing: false
-          success: false
-          fixed: false
-          fixed-unhealthy: true
-          still-unstable: false
-          pre-build: false
-          matrix-trigger: only-parent
-          send-to:
-            - recipients
-
-## Project
+## Projects
 - project:
     name: lttng-ust
     github_user: lttng
     github_name: lttng-ust
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
     version:
-      - stable-2.7
-      - stable-2.8
-      - stable-2.9
       - stable-2.10
       - stable-2.11
     jobs:
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [x86-32, x86-64]
+          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, master]
+          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")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
+          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, 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.8, stable-0.9, stable-0.10, 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 [x86-32, x86-64]
+          arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents, debug-rcu]
-          liburcu_version: !!python/tuple [master]
+          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")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: master
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [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 [master]
+          liburcu_version: !!python/tuple [stable-0.12, master]
+          filter: ''
       - 'lttng-ust_{version}_cppcheck':
           version: master
       - 'lttng-ust_{version}_scan-build':
@@ -347,3 +401,86 @@
       - 'lttng-ust_{version}_coverity':
           version: master
 
+      ## 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, tls_fallback]
+          liburcu_version: !!python/tuple [stable-0.12, 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]
+          filter: ''
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          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.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: lttng-ust-views
+    views:
+      - LTTng-ust