X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=1807ec14fcf4127814af9324d285d95207caec22;hb=07dafe32fe48ecc1fbd2ace4c302bfb6c9cf981c;hp=d5df88a08666a17762a214a9385ed8a96c53ff9b;hpb=9d56171a2dbaa3992a455c741ac55da952b5d100;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index d5df88a..1807ec1 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -332,7 +332,7 @@
     node: 'master' # Applies only to matrix flyweight task
     execution-strategy:
       combination-filter: |
-        (build=="std" && conf=="python-bindings") || (arch=="amd64")
+        (build=="std" && conf=="std") || (arch=="amd64")
     axes:
       - axis:
          type: slave
@@ -572,7 +572,15 @@
           send-to:
             - recipients
 
-## Project
+
+## Views
+- view-template:
+    name: 'Babeltrace'
+    view-type: list
+    regex: 'babeltrace[-_].*'
+
+
+## Projects
 - project:
     name: babeltrace1
     github_user: efficios
@@ -584,7 +592,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
@@ -608,7 +616,7 @@
           buildtype: macosxbuild
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, python-bindings, production]
+          conf: !!python/tuple [std, python-bindings]
       - 'babeltrace_{version}_{cctype}':
           cctype: clangbuild
           arch: !!python/tuple [amd64]
@@ -635,7 +643,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, prod, min]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: portbuild
@@ -670,6 +678,18 @@
       - '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]
+
+
 - project:
     name: babeltrace-jgalar-staging
     user: jgalar
@@ -679,35 +699,46 @@
     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.22.5':
+          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