X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=22bdc3a3cb2165fb07dfb6f0144d89f3324ff4a6;hb=d02fd60421fcb4a65ac1fedeb5dc8bce54b2ce4b;hp=6486914a7cf412cbbd19bf0910256595fc124d7a;hpb=499a96d098b73ffca345200f351cb433b032daeb;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 6486914..22bdc3a 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -34,7 +34,6 @@
             - origin/{version}
           basedir: src/babeltrace
           skip-tag: true
-          git-tool: jgit
 
     triggers:
       - pollscm:
@@ -69,6 +68,28 @@
          name: build
          values: '{obj:build}'
 
+- babeltrace_build_axes_cc: &babeltrace_build_axes_cc
+    name: 'babeltrace_build_axes_cc'
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    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}'
+      - axis:
+         type: user-defined
+         name: cc
+         values: '{obj:cc}'
+
 - babeltrace_build_builders_defaults: &babeltrace_build_builders_defaults
     name: 'babeltrace_build_builders_defaults'
     builders:
@@ -209,6 +230,27 @@
           send-to:
             - recipients
 
+- babeltrace_build_publishers_gerrit: &babeltrace_build_publishers_gerrit
+    name: 'babeltrace_build_publishers_gerrit'
+    publishers:
+      - tap:
+          results: 'tap/**/*.log'
+          failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
+      - warnings:
+          console-log-parsers:
+            - 'GNU Make + GNU C Compiler (gcc)'
+          total-thresholds:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+      - archive:
+          artifacts: 'build/**'
+          allow-empty: false
+
+
 ## Templates
 
 - job-template:
@@ -219,10 +261,30 @@
     <<: *babeltrace_build_builders_defaults
     <<: *babeltrace_build_publishers_prod
 
+- job-template:
+    name: babeltrace_{version}_{cctype}
+    defaults: babeltrace
+
+    <<: *babeltrace_build_axes_cc
+    <<: *babeltrace_build_builders_defaults
+    <<: *babeltrace_build_publishers_prod
+
 - job-template:
     name: babeltrace_{version}_winbuild
     defaults: babeltrace
 
+    # Use jgit on windows to work around path too long error
+    scm:
+      - git:
+          url: git://github.com/{github_user}/{github_name}.git
+          browser: githubweb
+          browser-url: https://github.com/{github_user}/{github_name}
+          branches:
+            - origin/{version}
+          basedir: src/babeltrace
+          skip-tag: true
+          git-tool: jgit
+
     <<: *babeltrace_build_axes_defaults
     <<: *babeltrace_build_builders_win
     <<: *babeltrace_build_publishers_prod
@@ -235,6 +297,65 @@
     <<: *babeltrace_build_builders_defaults
     <<: *babeltrace_build_publishers_dev
 
+- job-template:
+    name: dev_gerrit_babeltrace_{buildtype}
+    defaults: babeltrace
+    concurrent: true
+
+    scm:
+      - git:
+          url: https://review.lttng.org/babeltrace
+          refspec: 'refs/changes/*:refs/changes/*'
+          branches:
+            - '$GERRIT_REFSPEC'
+          basedir: src/babeltrace
+          skip-tag: true
+
+    triggers:
+      - gerrit:
+          trigger-on:
+            - comment-added-event:
+                approval-category: 'CI-Build'
+                approval-value: 1
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'babeltrace'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**'
+          trigger-for-unreviewed-patches: true
+
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    execution-strategy:
+      combination-filter: |
+        (build=="std" && conf=="python-bindings") || (arch=="amd64")
+    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}'
+
+    <<: *babeltrace_build_builders_defaults
+    <<: *babeltrace_build_publishers_gerrit
+
+    properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=babeltrace
+      - build-discarder:
+          days-to-keep: 2
+      - github:
+          url: https://github.com/{github_user}/{github_name}
+
 - job-template:
     name: babeltrace_{version}_cppcheck
     defaults: babeltrace
@@ -245,20 +366,20 @@
 
     builders:
       - shell: |
-          rm -f babeltrace-cppcheck.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/babeltrace 2> babeltrace-cppcheck.xml
+          rm -f cppcheck-result.xml
+          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/babeltrace 2> cppcheck-result.xml
 
     publishers:
       - archive:
-          artifacts: 'babeltrace-cppcheck.xml'
+          artifacts: 'cppcheck-result.xml'
           allow-empty: false
       - cppcheck:
-          pattern: 'babeltrace-cppcheck.xml'
+          pattern: 'cppcheck-result.xml'
 
 - job-template:
     name: babeltrace_{version}_scan-build
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -277,7 +398,7 @@
 - job-template:
     name: babeltrace_{version}_coverity
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -306,7 +427,7 @@
 - job-template:
     name: babeltrace_{version}_pylint
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     scm: []
 
@@ -316,7 +437,7 @@
 
     builders:
        - copyartifact:
-           project: babeltrace_{version}_build/arch=x86-64,build=std,conf=python-bindings
+           project: babeltrace_{version}_build/arch=amd64,build=std,conf=python-bindings
            which-build: last-successful
            stable: false
            filter: 'build/**'
@@ -365,14 +486,14 @@
 - babeltrace_version_glib-2-22-5_anchor: &babeltrace_version_glib-2-22-5_anchor
     name: 'babeltrace_version_glib_anchor'
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     builders:
       - inject:
           properties-content: |
             LD_LIBRARY_PATH=$WORKSPACE/glib-2.22.5/BUILD_RESULT/lib
             PKG_CONFIG_PATH=$WORKSPACE/glib-2.22.5/BUILD_RESULT/lib/pkgconfig
-            arch=x86-64
+            arch=amd64
             conf=std
             build=std
       - shell: |
@@ -452,25 +573,28 @@
     github_name: babeltrace
     email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
     version:
-      - stable-1.3
-      - stable-1.4
       - stable-1.5
       - stable-2.0
       - master
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [x86-32, x86-64]
+          arch: !!python/tuple [amd64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, static, python-bindings]
+          conf: !!python/tuple [std, static, python-bindings, production]
+          version:
+            - stable-2.0
+            - master
       - 'babeltrace_{version}_{buildtype}':
-          buildtype: clangbuild
-          arch: !!python/tuple [x86-32, x86-64]
-          build: !!python/tuple [clang]
-          conf: !!python/tuple [std, static]
+          buildtype: build
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, oot, dist]
+          conf: !!python/tuple [std, static, python-bindings]
+          version:
+            - stable-1.5
       - 'babeltrace_{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, static, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
@@ -478,6 +602,11 @@
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
+          version: # // support 1.3 on SLES12
+            - stable-1.3
+            - stable-1.5
+            - stable-2.0
+            - master
       - 'babeltrace_{version}_{buildtype}':
           buildtype: solarisbuild
           arch: !!python/tuple [sol10-i386, sol11-i386]
@@ -489,10 +618,15 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
           version: # macOS support was introduced in 1.4
-            - stable-1.4
             - stable-1.5
             - stable-2.0
             - master
+      - 'babeltrace_{version}_{cctype}':
+          cctype: clangbuild
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static]
+          cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7]
       - 'babeltrace_{version}_winbuild':
           arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64]
           build: !!python/tuple [std]
@@ -523,7 +657,6 @@
     email_to: "jgalar@efficios.com"
     version:
       - stable-1.3-staging
-      - stable-1.4-staging
       - stable-1.5-staging
       - stable-2.0-staging
       - master-staging
@@ -533,13 +666,12 @@
             - master-staging
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [x86-32, x86-64]
+          arch: !!python/tuple [amd64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
           buildtype: macosxbuild
           version: # macOS support was introduced in 1.4
-            - stable-1.4-staging
             - stable-1.5-staging
             - stable-2.0-staging
             - master-staging
@@ -547,3 +679,14 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
 
+
+- project:
+    name: gerrit-babeltrace
+    github_user: efficios
+    github_name: babeltrace
+    jobs:
+      - 'dev_gerrit_babeltrace_{buildtype}':
+          buildtype: build
+          arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std, oot, dist]
+          conf: !!python/tuple [std, static, python-bindings, production]