X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=0248868a4c3ef738dd08d8cbb6b502880d64094f;hb=b5dc61dec3d9d8612a14999cd7b54064af93f767;hp=335d5b8097f24aae726f36f2f0dac1ee79d38dc2;hpb=3e93ffa260f029a475fe76831b6bd4adca70cec9;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 335d5b8..0248868 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -1,3 +1,42 @@
+---
+## SCM Anchors
+- lttng-tools_default_git:
+    name: 'lttng-tools_default_git'
+    scm:
+      - git: &lttng-tools_default_git
+          url: https://github.com/{github_user}/lttng-tools.git
+          browser: githubweb
+          browser-url: https://github.com/{github_user}/lttng-tools
+          branches:
+            - '{version}'
+          basedir: src/lttng-tools
+          skip-tag: true
+
+- lttng-modules_default_git:
+    name: 'lttng-modules_default_git'
+    scm:
+      - git: &lttng-modules_default_git
+          url: https://github.com/{github_user}/lttng-modules.git
+          browser: githubweb
+          browser-url: https://github.com/{github_user}/lttng-modules
+          branches:
+            - '{version}'
+          basedir: src/lttng-modules
+          skip-tag: true
+
+- lttng-tools_gerrit_git:
+    name: 'lttng-tools_gerrit_git'
+    scm:
+      - git: &lttng-tools_gerrit_git
+          url: https://review.lttng.org/lttng-tools
+          refspec: 'refs/changes/*:refs/changes/*'
+          branches:
+            - '$GERRIT_REFSPEC'
+          basedir: src/lttng-tools
+          skip-tag: true
+
+
+## Defaults
 - defaults:
     name: lttng-tools
     description: |
@@ -14,7 +53,7 @@
       - ansicolor
       - timeout:
           timeout: 30
-          fail: true
+          abort: true
           type: no-activity
       - timestamps
       - workspace-cleanup:
@@ -22,14 +61,7 @@
             - failure: false
 
     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/lttng-tools
-          skip-tag: true
+      - git: *lttng-tools_default_git
 
     triggers:
       - pollscm:
@@ -40,13 +72,13 @@
           properties-content: |
             PROJECT_NAME=lttng-tools
       - github:
-          url: https://github.com/{github_user}/{github_name}
+          url: https://github.com/{github_user}/lttng-tools
       - build-discarder:
           num-to-keep: 20
           artifact-num-to-keep: 2
 
 
-## Anchors
+## Axis Anchors
 - lttng-tools_build_axes_defaults: &lttng-tools_build_axes_defaults
     name: 'lttng-tools_build_axes_defaults'
     project-type: matrix
@@ -79,6 +111,45 @@
          name: test_type
          values: '{obj:testtype}'
 
+- lttng-tools_build_axes_rootbuild: &lttng-tools_build_axes_rootbuild
+    name: 'lttng-tools_build_axes_rootbuild'
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    execution-strategy:
+      combination-filter: '{filter}'
+    axes:
+      - axis:
+         type: slave
+         name: node
+         values:
+           - 'amd64-rootnode'
+      - axis:
+         type: user-defined
+         name: arch
+         values: '{obj:arch}'
+      - axis:
+         type: user-defined
+         name: conf
+         values: '{obj:conf}'
+      - axis:
+         type: user-defined
+         name: liburcu_version
+         values: '{obj:urcuversion}'
+      - axis:
+         type: user-defined
+         name: babeltrace_version
+         values: '{obj:babelversion}'
+      - axis:
+         type: user-defined
+         name: build
+         values: '{obj:build}'
+      - axis:
+         type: user-defined
+         name: test_type
+         values: '{obj:testtype}'
+
+
+## Builders Anchors
 - lttng-tools_build_builders_defaults: &lttng-tools_build_builders_defaults
     name: 'lttng-tools_build_builders_defaults'
     builders:
@@ -129,13 +200,6 @@
                 filter: 'build/**'
                 target: 'deps'
                 do-not-fingerprint: true
-            - copyartifact:
-                project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=std,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
       - conditional-step:
           condition-kind: regex-match
           label: '$conf'
@@ -240,7 +304,9 @@
       - shell:
          !include-raw-escape: scripts/lttng-tools/clean_processes_coredump.sh
       - shell:
-         !include-raw-escape: scripts/lttng-tools/build.sh
+         !include-raw-escape:
+           - scripts/common/print.sh
+           - scripts/lttng-tools/build.sh
 
 - lttng-tools_build_builders_gerrit: &lttng-tools_build_builders_gerrit
     name: 'lttng-tools_build_builders_gerrit'
@@ -306,13 +372,6 @@
                 filter: 'build/**'
                 target: 'deps'
                 do-not-fingerprint: true
-            - copyartifact:
-                project: lttng-ust_${{GERRIT_BRANCH}}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=std,build=std
-                which-build: last-successful
-                stable: false
-                filter: 'build/**'
-                target: 'deps'
-                do-not-fingerprint: true
       - conditional-step:
           condition-kind: regex-match
           label: '$conf'
@@ -361,12 +420,15 @@
           steps:
             - shell:
                !include-raw-escape:
-                   - scripts/lttng-tools/gerrit-build-override.sh
+                   - scripts/common/override-build-std.sh
+                   - scripts/common/print.sh
                    - scripts/lttng-ust/build.sh
       - shell:
          !include-raw-escape: scripts/lttng-tools/gerrit-install-deps.sh
       - shell:
-         !include-raw-escape: scripts/lttng-tools/build.sh
+         !include-raw-escape:
+           - scripts/common/print.sh
+           - scripts/lttng-tools/build.sh
 
 - lttng-tools_build_builders_win: &lttng-tools_build_builders_win
     name: 'lttng-tools_build_builders_win'
@@ -378,13 +440,6 @@
           filter: 'build/**'
           target: 'deps'
           do-not-fingerprint: true
-      - copyartifact:
-          project: babeltrace_${{babeltrace_version}}_winbuild/arch=${{arch}},conf=std,build=std
-          which-build: last-successful
-          stable: false
-          filter: 'build/**'
-          target: 'deps'
-          do-not-fingerprint: true
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
@@ -395,6 +450,7 @@
                !include-raw-escape:
                  - scripts/common/cygwin64-shebang
                  - scripts/common/cygpath-prefix
+                 - scripts/common/print.sh
                  - scripts/lttng-tools/build.sh
       - conditional-step:
           condition-kind: strings-match
@@ -408,6 +464,7 @@
                !include-raw-escape:
                  - scripts/common/msys2-shebang
                  - scripts/common/cygpath-prefix
+                 - scripts/common/print.sh
                  - scripts/lttng-tools/build.sh
       - conditional-step:
           condition-kind: strings-match
@@ -421,11 +478,21 @@
                !include-raw-escape:
                  - scripts/common/msys2-shebang
                  - scripts/common/cygpath-prefix
+                 - scripts/common/print.sh
                  - scripts/lttng-tools/build.sh
 
 - lttng-tools_build_publishers_dev: &lttng-tools_build_publishers_dev
     name: 'lttng-tools_build_publishers_dev'
     publishers:
+      - postbuildscript:
+          mark-unstable-if-failed: false
+          builders:
+            - role: SLAVE
+              build-on:
+                  - ABORTED
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/tap_aborted.sh
       - postbuildscript:
           mark-unstable-if-failed: true
           builders:
@@ -484,6 +551,15 @@
 - lttng-tools_build_publishers_prod: &lttng-tools_build_publishers_prod
     name: 'lttng-tools_build_publishers_prod'
     publishers:
+      - postbuildscript:
+          mark-unstable-if-failed: false
+          builders:
+            - role: SLAVE
+              build-on:
+                  - ABORTED
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/tap_aborted.sh
       - postbuildscript:
           mark-unstable-if-failed: true
           builders:
@@ -608,9 +684,9 @@
     wrappers:
       - ansicolor
       - timeout:
-          timeout: 10
-          fail: true
-          type: likely-stuck
+          timeout: 45
+          abort: true
+          type: no-activity
       - timestamps
       - workspace-cleanup:
           clean-if:
@@ -627,6 +703,33 @@
             jobs: 'lttng-ust_{version}_{buildtype}'
             result: 'success'
 
+- job-template:
+    name: lttng-tools_{version}_rootbuild
+    defaults: lttng-tools
+
+    scm:
+      - git: *lttng-tools_default_git
+      - git: *lttng-modules_default_git
+
+    wrappers:
+      - ansicolor
+      - timeout:
+          timeout: 10
+          abort: true
+          type: no-activity
+      - timestamps
+
+    <<: *lttng-tools_build_axes_rootbuild
+    <<: *lttng-tools_build_builders_defaults
+    <<: *lttng-tools_build_publishers_prod
+
+    triggers:
+      - pollscm:
+          cron: "@hourly"
+      - reverse:
+            jobs: 'lttng-ust_{version}_build'
+            result: 'success'
+
 - job-template:
     name: lttng-tools_{version}_winbuild
     defaults: lttng-tools
@@ -649,13 +752,7 @@
     concurrent: true
 
     scm:
-      - git:
-          url: https://review.lttng.org/lttng-tools
-          refspec: 'refs/changes/*:refs/changes/*'
-          branches:
-            - '$GERRIT_REFSPEC'
-          basedir: src/lttng-tools
-          skip-tag: true
+      - git: *lttng-tools_gerrit_git
 
     triggers:
       - gerrit:
@@ -669,7 +766,6 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
-          trigger-for-unreviewed-patches: true
 
     properties:
       - inject:
@@ -686,6 +782,15 @@
     <<: *lttng-tools_build_builders_gerrit
 
     publishers:
+      - postbuildscript:
+          mark-unstable-if-failed: false
+          builders:
+            - role: SLAVE
+              build-on:
+                  - ABORTED
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/tap_aborted.sh
       - postbuildscript:
           mark-unstable-if-failed: true
           builders:
@@ -720,6 +825,157 @@
           clean-if:
             - failure: false
 
+- job-template:
+    name: dev_gerrit_lttng-tools_rootbuild
+    defaults: lttng-tools
+    concurrent: true
+
+    scm:
+      - git: *lttng-tools_gerrit_git
+      - git:
+          <<: *lttng-modules_default_git
+          branches:
+            - '$GERRIT_BRANCH'
+
+    triggers:
+      - gerrit:
+          trigger-on:
+            - comment-added-event:
+                approval-category: 'CI-Build'
+                approval-value: 1
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'lttng-tools'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**'
+
+    properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=lttng-tools
+      - build-discarder:
+          days-to-keep: 1
+      - throttle:
+          option: 'category'
+          categories:
+            - 'gerrit-{buildtype}'
+
+    <<: *lttng-tools_build_axes_rootbuild
+    <<: *lttng-tools_build_builders_gerrit
+
+    publishers:
+      - tap:
+          results: 'tap/**/*.*'
+          fail-if-no-results: true
+          failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
+      - warnings:
+          console-log-parsers:
+            - 'GNU Make + GNU C Compiler (gcc)'
+          total-thresholds:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+      - archive:
+          artifacts: 'build/**,deps/**,tap/**'
+          allow-empty: false
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
+
+- job-template:
+    name: lttng-tools_{version}_release
+    defaults: lttng-tools
+    node: 'amd64'
+
+    triggers:
+      - pollscm:
+          cron: "@daily"
+
+    scm:
+      - git:
+          url: https://github.com/{github_user}/lttng-tools.git
+          browser: githubweb
+          browser-url: https://github.com/{github_user}/lttng-tools
+          refspec: '+refs/tags/*:refs/remotes/origin/tags/*'
+          branches:
+            - '*/tags/{version}.*'
+          basedir: src/lttng-tools
+
+    builders:
+      - copyartifact:
+          project: liburcu_{urcuversion}_build/arch=amd64,conf=std,build=std
+          which-build: last-successful
+          stable: false
+          filter: 'build/**'
+          target: 'deps'
+          do-not-fingerprint: true
+      - copyartifact:
+          project: babeltrace_{babelversion}_build/arch=amd64,conf=std,build=std
+          which-build: last-successful
+          stable: false
+          filter: 'build/**'
+          target: 'deps'
+          do-not-fingerprint: true
+      - copyartifact:
+          project: lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=amd64,conf=agents,build=std
+          which-build: last-successful
+          stable: false
+          filter: 'build/**'
+          target: 'deps'
+          do-not-fingerprint: true
+      - shell:
+          !include-raw-escape: scripts/lttng-tools/clean_processes_coredump.sh
+      - shell:
+          !include-raw-escape: scripts/lttng-tools/release.sh
+
+    publishers:
+      - postbuildscript:
+          mark-unstable-if-failed: false
+          builders:
+            - role: SLAVE
+              build-on:
+                  - ABORTED
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/tap_aborted.sh
+      - postbuildscript:
+          mark-unstable-if-failed: true
+          builders:
+            - role: SLAVE
+              build-on:
+                  - SUCCESS
+                  - UNSTABLE
+                  - NOT_BUILT
+                  - ABORTED
+                  - FAILURE
+              build-steps:
+                  - shell:
+                      !include-raw-escape: scripts/lttng-tools/hang_processes.sh
+      - tap:
+          results: 'tap/**/*.*'
+          fail-if-no-results: true
+          failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
+      - warnings:
+          console-log-parsers:
+            - 'GNU Make + GNU C Compiler (gcc)'
+          total-thresholds:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
+      - archive:
+          artifacts: 'out/**'
+          allow-empty: false
+
 - job-template:
     name: lttng-tools_{version}_cppcheck
     defaults: lttng-tools
@@ -851,7 +1107,6 @@
 - project:
     name: lttng-tools
     github_user: lttng
-    github_name: lttng-tools
     email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
     version:
       - stable-2.10
@@ -886,7 +1141,7 @@
           buildtype: slesbuild
           version: master
           ustversion: master
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [master]
@@ -905,21 +1160,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
-          version: master
-          ustversion: master
-          arch: !!python/tuple [macosx]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
+          buildtype: macosbuild
           version: master
           ustversion: master
-          arch: !!python/tuple [sol10-i386, sol11-i386]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
@@ -947,6 +1191,17 @@
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [full]
           filter: ''
+      - 'lttng-tools_{version}_rootbuild':
+          buildtype: build
+          version: master
+          ustversion: master
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          urcuversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-2.0]
+          testtype: !!python/tuple [base]
+          filter: ''
 
       # stable-2.12
       - 'lttng-tools_{version}_{buildtype}':
@@ -975,7 +1230,7 @@
           buildtype: slesbuild
           version: stable-2.12
           ustversion: stable-2.12
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.12]
@@ -994,21 +1249,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
-          version: stable-2.12
-          ustversion: stable-2.12
-          arch: !!python/tuple [sol10-i386, sol11-i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.12]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: macosbuild
           version: stable-2.12
           ustversion: stable-2.12
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.12]
@@ -1036,6 +1280,22 @@
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [full]
           filter: ''
+      - 'lttng-tools_{version}_rootbuild':
+          buildtype: build
+          version: stable-2.12
+          ustversion: stable-2.12
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          urcuversion: !!python/tuple [stable-0.12]
+          babelversion: !!python/tuple [stable-2.0]
+          testtype: !!python/tuple [base]
+          filter: ''
+      - 'lttng-tools_{version}_release':
+          version: v2.12
+          ustversion: stable-2.12
+          urcuversion: stable-0.12
+          babelversion: stable-2.0
 
       # stable-2.11
       - 'lttng-tools_{version}_{buildtype}':
@@ -1064,7 +1324,7 @@
           buildtype: slesbuild
           version: stable-2.11
           ustversion: stable-2.11
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.10]
@@ -1083,48 +1343,53 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
+          buildtype: macosbuild
           version: stable-2.11
           ustversion: stable-2.11
-          arch: !!python/tuple [sol10-i386, sol11-i386]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.10]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
           filter: ''
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+      - 'lttng-tools_{version}_winbuild':
           version: stable-2.11
           ustversion: stable-2.11
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.10]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
           filter: ''
-      - 'lttng-tools_{version}_winbuild':
+      - 'lttng-tools_{version}_long_regression':
+          buildtype: build
           version: stable-2.11
           ustversion: stable-2.11
-          arch: !!python/tuple [cygwin64]
+          arch: !!python/tuple [amd64]
           build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
+          conf: !!python/tuple [std]
           urcuversion: !!python/tuple [stable-0.10]
           babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
+          testtype: !!python/tuple [full]
           filter: ''
-      - 'lttng-tools_{version}_long_regression':
+      - 'lttng-tools_{version}_rootbuild':
           buildtype: build
           version: stable-2.11
           ustversion: stable-2.11
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.10]
           babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [full]
+          testtype: !!python/tuple [base]
           filter: ''
+      - 'lttng-tools_{version}_release':
+          version: v2.11
+          ustversion: stable-2.11
+          urcuversion: stable-0.10
+          babelversion: stable-1.5
 
       # stable-2.10
       - 'lttng-tools_{version}_{buildtype}':
@@ -1153,7 +1418,7 @@
           buildtype: slesbuild
           version: stable-2.10
           ustversion: stable-2.10
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1172,21 +1437,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          arch: !!python/tuple [sol10-i386, sol11-i386]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: macosbuild
           version: stable-2.10
           ustversion: stable-2.10
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1214,13 +1468,18 @@
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [full]
           filter: ''
+      - 'lttng-tools_{version}_release':
+          version: v2.10
+          ustversion: stable-2.10
+          urcuversion: stable-0.9
+          babelversion: stable-1.5
 
       # stable-2.9 #
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.9
           ustversion: stable-2.9
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1233,7 +1492,7 @@
           buildtype: slesbuild
           version: stable-2.8
           ustversion: stable-2.8
-          arch: !!python/tuple [sles12sp2]
+          arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1264,7 +1523,6 @@
     name: dev_jgalar_lttng-tools
     user: jgalar
     github_user: jgalar
-    github_name: lttng-tools
     email_to: 'jgalar@efficios.com'
     jobs:
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
@@ -1319,7 +1577,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [stable-1.5]
+          babelversion: !!python/tuple [stable-1.5, master]
           testtype: !!python/tuple [base]
           filter: ''
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
@@ -1356,21 +1614,10 @@
           testtype: !!python/tuple [base]
           filter: ''
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: macosbuild
           version: master-staging
           ustversion: master
-          arch: !!python/tuple [macosx]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-          filter: ''
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
-          version: master-staging
-          ustversion: master
-          arch: !!python/tuple [sol10-i386, sol11-i386]
+          arch: !!python/tuple [macos-amd64, macos-arm64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
@@ -1381,7 +1628,6 @@
 - project:
     name: gerrit-lttng-tools
     github_user: lttng
-    github_name: lttng-tools
     jobs:
       - 'dev_gerrit_lttng-tools_{buildtype}':
           buildtype: build
@@ -1392,6 +1638,15 @@
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
           filter: ''
+      - 'dev_gerrit_lttng-tools_rootbuild':
+          buildtype: build
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          urcuversion: !!python/tuple [stable-0.12]
+          babelversion: !!python/tuple [stable-2.0]
+          testtype: !!python/tuple [base]
+          filter: ''
 
 - project:
     name: lttng-tools-views