X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=jobs%2Fbabeltrace.yaml;h=da6ba00ae44775d8668b2500e3b992ccc92946d5;hb=3f7ea864199cffe7601489aa0b3a2aeccf9c0695;hp=cc80e2e796fb8effc4b1600f38624cc1f612255c;hpb=af11423c1194469eaece9f550547b845720fbac9;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index cc80e2e..da6ba00 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
@@ -362,7 +350,50 @@
       - throttle:
           option: 'category'
           categories:
-            - 'gerrit'
+            - '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
@@ -513,7 +544,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'
@@ -521,17 +552,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
 
@@ -539,11 +570,11 @@
          !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/**'
@@ -572,8 +603,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:
@@ -711,7 +742,7 @@
       - 'babeltrace_{version}_pylint'
       - 'babeltrace_{version}_coverity':
           version: master
-      - 'babeltrace_{version}_glib-2.22.5':
+      - 'babeltrace_{version}_glib-2.28.6':
           version: master
 
 - project:
@@ -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'
 
 
@@ -768,7 +803,7 @@
       - stable-2.0-staging
       - master-staging
     jobs:
-      - 'dev_{user}_babeltrace_{version}_glib-2.22.5':
+      - 'dev_{user}_babeltrace_{version}_glib-2.28.6':
           version:
             - master-staging
       - 'dev_{user}_babeltrace_{version}_{buildtype}':