jjb: move to NoActivity timeouts

[lttng-ci.git] / jobs / babeltrace.yaml

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index cc80e2e796fb8effc4b1600f38624cc1f612255c..7b3974ecc6bd524bf0303137edd73ef19b2b971b 100644 (file)
--- 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
@@ -364,6 +352,49 @@
           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
@@ -731,6 +762,10 @@
           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'