X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=ec6423900beda88d4f66017fdeb76ff83030b027;hb=3b9bb48d192c642d57f678220c236ede3814ddb1;hp=b694039148c70ee1951ff18819b4d7d382edff44;hpb=8abe9f8a36c7638231dc794afa127a7728b45c87;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index b694039..ec64239 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -27,7 +27,7 @@
 
     scm:
       - git:
-          url: git://github.com/{github_user}/{github_name}.git
+          url: https://github.com/{github_user}/{github_name}.git
           browser: githubweb
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
@@ -94,7 +94,9 @@
     name: 'babeltrace_build_builders_defaults'
     builders:
       - shell:
-         !include-raw-escape: scripts/babeltrace/build.sh
+         !include-raw-escape:
+           - scripts/common/print.sh
+           - scripts/babeltrace/build.sh
 
 - babeltrace_build_builders_win: &babeltrace_build_builders_win
     name: 'babeltrace_build_builders_win'
@@ -109,6 +111,7 @@
                !include-raw-escape:
                  - scripts/common/cygwin64-shebang
                  - scripts/common/cygpath-prefix
+                 - scripts/common/print.sh
                  - scripts/babeltrace/build.sh
       - conditional-step:
           condition-kind: strings-match
@@ -122,6 +125,7 @@
                !include-raw-escape:
                  - scripts/common/msys2-shebang
                  - scripts/common/cygpath-prefix
+                 - scripts/common/print.sh
                  - scripts/babeltrace/build.sh
       - conditional-step:
           condition-kind: strings-match
@@ -135,6 +139,7 @@
                !include-raw-escape:
                  - scripts/common/msys2-shebang
                  - scripts/common/cygpath-prefix
+                 - scripts/common/print.sh
                  - scripts/babeltrace/build.sh
 
 
@@ -306,7 +311,6 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
-          trigger-for-unreviewed-patches: true
 
     project-type: matrix
     node: 'master' # Applies only to matrix flyweight task
@@ -367,7 +371,6 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
-          trigger-for-unreviewed-patches: true
 
     properties:
       - inject:
@@ -395,7 +398,7 @@
 
     scm:
       - git:
-          url: git://github.com/{github_user}/{github_name}.git
+          url: https://github.com/{github_user}/{github_name}.git
           browser: githubweb
           browser-url: https://github.com/{github_user}/{github_name}
           refspec: '+refs/tags/*:refs/remotes/origin/tags/*'
@@ -455,7 +458,6 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
-          trigger-for-unreviewed-patches: true
 
     node: 'amd64'
 
@@ -601,7 +603,9 @@
           make install
 
       - shell:
-         !include-raw-escape: scripts/babeltrace/build.sh
+         !include-raw-escape:
+           - scripts/common/print.sh
+           - scripts/babeltrace/build.sh
 
 - job-template:
     name: babeltrace_{version}_glib-2.28.6
@@ -693,7 +697,7 @@
           conf: !!python/tuple [std, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
@@ -702,13 +706,13 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
-          buildtype: solarisbuild
-          arch: !!python/tuple [sol10-i386, sol11-i386]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, static]
+          conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: freebsdbuild
+          arch: !!python/tuple [freebsd]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
       - 'babeltrace_{version}_{cctype}':
@@ -747,7 +751,7 @@
           conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{buildtype}':
@@ -756,8 +760,13 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: freebsdbuild
+          arch: !!python/tuple [freebsd]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
       - 'babeltrace_{version}_{cctype}':
@@ -792,8 +801,8 @@
           conf: !!python/tuple [std, static, prod, min]
           filter: '(build=="std" && conf=="std") || (arch=="amd64")'
       - 'dev_gerrit_babeltrace_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]
           filter: ''
@@ -819,8 +828,8 @@
           build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, static, python-bindings]
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
-          buildtype: macosxbuild
-          arch: !!python/tuple [macosx]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
 
@@ -844,8 +853,8 @@
           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]
+          buildtype: macosbuild
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, prod]