X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=7b3974ecc6bd524bf0303137edd73ef19b2b971b;hb=733146f2cf2f1742aabf74b7b800433b400fce73;hp=7212bfebee191fe56713d6e5bc492018d0a1e311;hpb=5279b0f28620328ec87e4fbe6765d2696635597b;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 7212bfe..7b3974e 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -17,9 +17,9 @@
     wrappers:
       - ansicolor
       - timeout:
-          timeout: 90
+          timeout: 20
           fail: true
-          type: absolute
+          type: no-activity
       - timestamps
       - workspace-cleanup:
           clean-if:
@@ -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:
@@ -133,6 +154,7 @@
     publishers:
       - tap:
           results: 'tap/**/*.log'
+          fail-if-no-results: true
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -144,6 +166,9 @@
               total-high: 0
               total-normal: 0
               total-low: 0
+      - archive:
+          artifacts: 'tap/**'
+          allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
           always: false
@@ -172,6 +197,7 @@
     publishers:
       - tap:
           results: 'tap/**/*.log'
+          fail-if-no-results: true
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -184,7 +210,7 @@
               total-normal: 0
               total-low: 0
       - archive:
-          artifacts: 'build/**'
+          artifacts: 'build/**,tap/**'
           allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
@@ -209,6 +235,28 @@
           send-to:
             - recipients
 
+- babeltrace_build_publishers_gerrit: &babeltrace_build_publishers_gerrit
+    name: 'babeltrace_build_publishers_gerrit'
+    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
+
+
 ## Templates
 
 - job-template:
@@ -219,6 +267,14 @@
     <<: *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
@@ -235,6 +291,151 @@
     <<: *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: |
+        {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}'
+
+    <<: *babeltrace_build_builders_defaults
+    <<: *babeltrace_build_publishers_gerrit
+
+    properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=babeltrace
+      - build-discarder:
+          days-to-keep: 1
+      - throttle:
+          option: 'category'
+          categories:
+            - 'gerrit'
+
+- job-template:
+    name: dev_gerrit_babeltrace_winbuild
+    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
+
+    properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=babeltrace
+      - build-discarder:
+          days-to-keep: 1
+      - throttle:
+          option: 'category'
+          categories:
+            - 'gerrit'
+
+    <<: *babeltrace_build_axes_defaults
+    <<: *babeltrace_build_builders_win
+    <<: *babeltrace_build_publishers_gerrit
+
+- job-template:
+    name: dev_gerrit_babeltrace_pylint
+    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
+
+    node: 'amd64'
+
+    builders:
+      - shell:
+         !include-raw-escape: scripts/babeltrace/pylint.sh
+
+    properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=babeltrace
+      - build-discarder:
+          days-to-keep: 1
+
 - job-template:
     name: babeltrace_{version}_cppcheck
     defaults: babeltrace
@@ -258,7 +459,7 @@
 - job-template:
     name: babeltrace_{version}_scan-build
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -277,7 +478,7 @@
 - job-template:
     name: babeltrace_{version}_coverity
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -306,38 +507,19 @@
 - job-template:
     name: babeltrace_{version}_pylint
     defaults: babeltrace
-    node: 'x86-64'
-
-    scm: []
+    node: 'amd64'
 
     triggers:
       - pollscm:
           cron: "@daily"
 
     builders:
-       - copyartifact:
-           project: babeltrace_{version}_build/arch=x86-64,build=std,conf=python-bindings
-           which-build: last-successful
-           stable: false
-           filter: 'build/**'
-           target: 'deps/babeltrace'
        - shell:
           !include-raw-escape: scripts/babeltrace/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
+          artifacts: 'black.out,flake8.out'
       - email-ext:
           recipients: '{obj:email_to}'
           reply-to: ci-notification@lists.lttng.org
@@ -365,14 +547,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: |
@@ -394,6 +576,9 @@
           cron: "@daily"
     <<: *babeltrace_version_glib-2-22-5_anchor
     publishers:
+      - archive:
+          artifacts: 'tap/**'
+          allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
           reply-to: ci-notification@lists.lttng.org
@@ -445,39 +630,46 @@
           send-to:
             - recipients
 
-## Project
+
+## Views
+- view-template:
+    name: 'Babeltrace'
+    view-type: list
+    regex: 'babeltrace[-_].*'
+
+
+## Projects
 - project:
-    name: babeltrace
+    name: babeltrace1
     github_user: efficios
     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]
-          build: !!python/tuple [std, oot, dist]
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, static, python-bindings]
-      - 'babeltrace_{version}_{buildtype}':
-          buildtype: clangbuild
-          arch: !!python/tuple [x86-32, x86-64]
-          build: !!python/tuple [clang]
-          conf: !!python/tuple [std, static]
       - '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]
+          conf: !!python/tuple [std, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
+          version: # // support 1.3 on SLES12
+            - stable-1.3
+            - stable-1.5
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: elbuild
+          arch: !!python/tuple [el8]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: solarisbuild
           arch: !!python/tuple [sol10-i386, sol11-i386]
@@ -488,24 +680,63 @@
           arch: !!python/tuple [macosx]
           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]
+          arch: !!python/tuple [cygwin, cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          version: # Mingw support was introduced in 2.0
-            - stable-2.0
-            - master
+      - 'babeltrace_{version}_cppcheck'
+      - 'babeltrace_{version}_scan-build'
+
+- project:
+    name: babeltrace2
+    github_user: efficios
+    github_name: babeltrace
+    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
+    version:
+      - stable-2.0
+      - master
+    jobs:
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: build
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, oot, dist, oot-dist]
+          conf: !!python/tuple [std, static, prod, min]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: portbuild
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: slesbuild
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: elbuild
+          arch: !!python/tuple [el8]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: macosxbuild
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{cctype}':
+          cctype: clangbuild
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static, prod]
+          cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7]
       - 'babeltrace_{version}_winbuild':
-          arch: !!python/tuple [cygwin, cygwin64]
+          arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          version: # Cygwin support was introduced in 1.5
-            - stable-1.5
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
       - 'babeltrace_{version}_pylint'
@@ -514,6 +745,29 @@
       - 'babeltrace_{version}_glib-2.22.5':
           version: master
 
+- 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, oot-dist]
+          conf: !!python/tuple [std, static, prod, min]
+          filter: '(build=="std" && conf=="std") || (arch=="amd64")'
+      - 'dev_gerrit_babeltrace_{buildtype}':
+          buildtype: macosxbuild
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+          filter: ''
+      - 'dev_gerrit_babeltrace_winbuild':
+          arch: !!python/tuple [cygwin64, msys2-mingw64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+      - 'dev_gerrit_babeltrace_pylint'
+
 
 - project:
     name: babeltrace-jgalar-staging
@@ -523,8 +777,29 @@
     email_to: "jgalar@efficios.com"
     version:
       - stable-1.3-staging
-      - stable-1.4-staging
       - stable-1.5-staging
+    jobs:
+      - 'dev_{user}_babeltrace_{version}_{buildtype}':
+          buildtype: build
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, oot, dist, 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.5-staging
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+
+
+- project:
+    name: babeltrace2-jgalar-staging
+    user: jgalar
+    github_user: jgalar
+    github_name: babeltrace
+    email_to: "jgalar@efficios.com"
+    version:
       - stable-2.0-staging
       - master-staging
     jobs:
@@ -533,17 +808,16 @@
             - master-staging
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [x86-32, x86-64]
-          build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, static, python-bindings]
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, oot, dist, oot-dist]
+          conf: !!python/tuple [std, static, prod, min]
       - '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
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
 
+- project:
+    name: babeltrace-views
+    views:
+      - Babeltrace