X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=d37d4db98782724fc213c6fe237d9c25519753de;hb=c95cf818753c9d8f6b6c16709c4c216117088dd0;hp=c6f502a7bfdd85224e299bd80dd4d887bc840898;hpb=c3accd92fccc9f6b22c9af2d91e4b0e97556c66f;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index c6f502a..d37d4db 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:
@@ -99,17 +99,6 @@
 - babeltrace_build_builders_win: &babeltrace_build_builders_win
     name: 'babeltrace_build_builders_win'
     builders:
-      - conditional-step:
-          condition-kind: strings-match
-          on-evaluation-failure: run
-          condition-string1: '${{arch}}'
-          condition-string2: 'cygwin'
-          steps:
-            - shell:
-               !include-raw-escape:
-                 - scripts/common/cygwin-shebang
-                 - scripts/common/cygwin-prefix
-                 - scripts/babeltrace/build.sh
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
@@ -119,7 +108,7 @@
             - shell:
                !include-raw-escape:
                  - scripts/common/cygwin64-shebang
-                 - scripts/common/cygwin-prefix
+                 - scripts/common/cygpath-prefix
                  - scripts/babeltrace/build.sh
       - conditional-step:
           condition-kind: strings-match
@@ -132,7 +121,7 @@
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
-                 - scripts/common/cygwin-prefix
+                 - scripts/common/cygpath-prefix
                  - scripts/babeltrace/build.sh
       - conditional-step:
           condition-kind: strings-match
@@ -145,7 +134,7 @@
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
-                 - scripts/common/cygwin-prefix
+                 - scripts/common/cygpath-prefix
                  - scripts/babeltrace/build.sh
 
 
@@ -154,6 +143,7 @@
     publishers:
       - tap:
           results: 'tap/**/*.log'
+          fail-if-no-results: true
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -165,6 +155,9 @@
               total-high: 0
               total-normal: 0
               total-low: 0
+      - archive:
+          artifacts: 'tap/**'
+          allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
           always: false
@@ -193,6 +186,7 @@
     publishers:
       - tap:
           results: 'tap/**/*.log'
+          fail-if-no-results: true
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -205,7 +199,7 @@
               total-normal: 0
               total-low: 0
       - archive:
-          artifacts: 'build/**'
+          artifacts: 'build/**,tap/**'
           allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
@@ -235,19 +229,20 @@
     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:
-            unstable:
+            failed:
               total-all: 0
               total-high: 0
               total-normal: 0
               total-low: 0
       - archive:
-          artifacts: 'build/**'
+          artifacts: 'build/**,tap/**'
           allow-empty: false
 
 
@@ -273,18 +268,6 @@
     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
@@ -329,7 +312,7 @@
     node: 'master' # Applies only to matrix flyweight task
     execution-strategy:
       combination-filter: |
-        (build=="std" && conf=="python-bindings") || (arch=="amd64")
+        {filter}
     axes:
       - axis:
          type: slave
@@ -352,9 +335,95 @@
           properties-content: |
             PROJECT_NAME=babeltrace
       - build-discarder:
-          days-to-keep: 2
-      - github:
-          url: https://github.com/{github_user}/{github_name}
+          days-to-keep: 1
+      - throttle:
+          option: 'category'
+          categories:
+            - 'gerrit-{buildtype}'
+
+- 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-winbuild'
+
+    <<: *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
@@ -429,36 +498,17 @@
     defaults: babeltrace
     node: 'amd64'
 
-    scm: []
-
     triggers:
       - pollscm:
           cron: "@daily"
 
     builders:
-       - copyartifact:
-           project: babeltrace_{version}_build/arch=amd64,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
@@ -483,7 +533,7 @@
             - recipients
 
 # Use - in version number since yaml anchor do not support dot
-- babeltrace_version_glib-2-22-5_anchor: &babeltrace_version_glib-2-22-5_anchor
+- babeltrace_version_glib-2-28-6_anchor: &babeltrace_version_glib-2-28-6_anchor
     name: 'babeltrace_version_glib_anchor'
     defaults: babeltrace
     node: 'amd64'
@@ -491,17 +541,17 @@
     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
+            LD_LIBRARY_PATH=$WORKSPACE/glib-2.28.6/BUILD_RESULT/lib
+            PKG_CONFIG_PATH=$WORKSPACE/glib-2.28.6/BUILD_RESULT/lib/pkgconfig
             arch=amd64
             conf=std
             build=std
       - shell: |
-          wget http://ftp.gnome.org/pub/gnome/sources/glib/2.22/glib-2.22.5.tar.gz
-          tar xvf glib-2.22.5.tar.gz
-          cd glib-2.22.5
+          wget http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.6.tar.gz
+          tar xvf glib-2.28.6.tar.gz
+          cd glib-2.28.6
           mkdir BUILD_RESULT
-          ./configure --prefix=$WORKSPACE/glib-2.22.5/BUILD_RESULT
+          ./configure --prefix=$WORKSPACE/glib-2.28.6/BUILD_RESULT
           make -j `nproc`
           make install
 
@@ -509,12 +559,15 @@
          !include-raw-escape: scripts/babeltrace/build.sh
 
 - job-template:
-    name: babeltrace_{version}_glib-2.22.5
+    name: babeltrace_{version}_glib-2.28.6
     triggers:
       - pollscm:
           cron: "@daily"
-    <<: *babeltrace_version_glib-2-22-5_anchor
+    <<: *babeltrace_version_glib-2-28-6_anchor
     publishers:
+      - archive:
+          artifacts: 'tap/**'
+          allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
           reply-to: ci-notification@lists.lttng.org
@@ -539,8 +592,8 @@
             - recipients
 
 - job-template:
-    name: dev_{user}_babeltrace_{version}_glib-2.22.5
-    <<: *babeltrace_version_glib-2-22-5_anchor
+    name: dev_{user}_babeltrace_{version}_glib-2.28.6
+    <<: *babeltrace_version_glib-2-28-6_anchor
 
     publishers:
       - email-ext:
@@ -566,7 +619,15 @@
           send-to:
             - recipients
 
-## Project
+
+## Views
+- view-template:
+    name: 'Babeltrace'
+    view-type: list
+    regex: 'babeltrace[-_].*'
+
+
+## Projects
 - project:
     name: babeltrace1
     github_user: efficios
@@ -578,7 +639,7 @@
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist]
+          build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, static, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: portbuild
@@ -590,9 +651,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
+      - '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]
@@ -602,7 +665,7 @@
           buildtype: macosxbuild
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, python-bindings, production]
+          conf: !!python/tuple [std]
       - 'babeltrace_{version}_{cctype}':
           cctype: clangbuild
           arch: !!python/tuple [amd64]
@@ -610,12 +673,11 @@
           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]
+          arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
-      - 'babeltrace_{version}_pylint'
 
 - project:
     name: babeltrace2
@@ -629,31 +691,36 @@
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, static, python-bindings, production]
+          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, python-bindings]
+          conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!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, python-bindings, production]
+          conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{cctype}':
           cctype: clangbuild
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, static]
+          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, msys2-mingw32, msys2-mingw64]
+          arch: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_cppcheck'
@@ -661,9 +728,33 @@
       - 'babeltrace_{version}_pylint'
       - 'babeltrace_{version}_coverity':
           version: master
-      - 'babeltrace_{version}_glib-2.22.5':
+      - 'babeltrace_{version}_glib-2.28.6':
           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
     user: jgalar
@@ -671,37 +762,45 @@
     github_name: babeltrace
     email_to: "jgalar@efficios.com"
     version:
-      - stable-1.3-staging
       - stable-1.5-staging
-      - stable-2.0-staging
-      - master-staging
     jobs:
-      - 'dev_{user}_babeltrace_{version}_glib-2.22.5':
-          version:
-            - master-staging
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist]
+          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
-            - stable-2.0-staging
-            - master-staging
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
 
 
 - project:
-    name: gerrit-babeltrace
-    github_user: efficios
+    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:
-      - 'dev_gerrit_babeltrace_{buildtype}':
+      - 'dev_{user}_babeltrace_{version}_glib-2.28.6':
+          version:
+            - master-staging
+      - 'dev_{user}_babeltrace_{version}_{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]
+          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
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+
+- project:
+    name: babeltrace-views
+    views:
+      - Babeltrace