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

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index b6e3e2d..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:
@@ -279,18 +279,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
@@ -365,7 +353,50 @@
             - 'gerrit'
 
 - job-template:
-    name: dev_gerrit_babeltrace_black
+    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
 
@@ -396,7 +427,7 @@
 
     builders:
       - shell:
-         !include-raw-escape: scripts/babeltrace/black.sh
+         !include-raw-escape: scripts/babeltrace/pylint.sh
 
     properties:
       - inject:
@@ -478,36 +509,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
@@ -680,7 +692,6 @@
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
-      - 'babeltrace_{version}_pylint'
 
 - project:
     name: babeltrace2
@@ -751,7 +762,11 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
           filter: ''
-      - 'dev_gerrit_babeltrace_black'
+      - 'dev_gerrit_babeltrace_winbuild':
+          arch: !!python/tuple [cygwin64, msys2-mingw64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+      - 'dev_gerrit_babeltrace_pylint'
 
 
 - project: