X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Fbinutils-gdb.yaml;h=28fcf9b92d9201685ec747faca53fd081d422088;hb=8dabb7f6795e18bbe9755b2d166ebbc495e15ff8;hp=fa88daa5bbcc2af628f87fdf1c578d951f0db214;hpb=748dd275290eeff3a1eda558d6e8f263188f55c8;p=lttng-ci.git

diff --git a/jobs/binutils-gdb.yaml b/jobs/binutils-gdb.yaml
index fa88daa..28fcf9b 100644
--- a/jobs/binutils-gdb.yaml
+++ b/jobs/binutils-gdb.yaml
@@ -8,15 +8,15 @@
     project-type: freestyle
 
     wrappers:
-      - ansicolor
+      - ansicolor:
+          colormap: gnome-terminal
       - timeout:
-          timeout: 20
+          timeout: 180
           fail: true
-          type: no-activity
+          type: absolute
+          write-description: "<h1 style=\"color:red\">This build failed due to timeout.</h1>"
       - timestamps
-      - workspace-cleanup:
-          clean-if:
-            - failure: false
+      - workspace-cleanup
 
     scm:
       - git:
@@ -38,60 +38,72 @@
           num-to-keep: 10
 
 
-## Templates ##
-- job-template:
-    name: binutils-gdb_{version}_build
-    defaults: binutils-gdb
+## Anchors
 
+# Default matrix axes
+- _binutils-gdb_matrix_axes_defaults: &binutils-gdb_matrix_axes_defaults
+    name: 'binutils-gdb_matrix_axes_defaults'
     project-type: matrix
     node: 'master' # Applies only to matrix flyweight task
     axes:
-      - axis:
+      - axis: &binutils-gdb_matrix_axis_platform
          type: slave
-         name: arch
-         values: '{obj:arch}'
-      - axis:
+         name: platform
+         values: '{obj:platforms}'
+      - axis: &binutils-gdb_matrix_axis_target_board
          type: user-defined
          name: target_board
-         values: '{obj:target_board}'
+         values: '{obj:target_boards}'
 
+# Default builders
+- _binutils-gdb_builders_defaults: &binutils-gdb_builders_defaults
+    name: 'binutils-gdb_builders_defaults'
     builders:
       - shell:
          !include-raw-escape:
            - scripts/common/print.sh
            - scripts/binutils-gdb/build.sh
 
+
+## Templates ##
+- job-template:
+    name: binutils-gdb_{version}_linuxbuild
+    defaults: binutils-gdb
+
+    <<: *binutils-gdb_matrix_axes_defaults
+    <<: *binutils-gdb_builders_defaults
+
     publishers:
       - archive:
-          artifacts: 'build/**,results/**'
+          artifacts: 'results/**'
           allow-empty: false
       - junit:
           results: 'results/*.xml'
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
       - email:
           recipients: 'simon.marchi@efficios.com'
 
-    builders:
-      - shell:
-         !include-raw-escape:
-           - scripts/common/print.sh
-           - scripts/binutils-gdb/build.sh
+- job-template:
+    name: binutils-gdb_{version}_macosbuild
+    defaults: binutils-gdb
+
+    <<: *binutils-gdb_matrix_axes_defaults
+    <<: *binutils-gdb_builders_defaults
 
     publishers:
-      - archive:
-          artifacts: 'build/**,results/**'
-          allow-empty: false
-      - junit:
-          results: 'results/*.xml'
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
       - email:
           recipients: 'simon.marchi@efficios.com'
 
 - job-template:
-    name: dev_gerrit_binutils-gdb_build
+    name: dev_review_binutils-gdb_linuxbuild
     defaults: binutils-gdb
     concurrent: true
 
-    project-type: matrix
-
     scm:
       - git:
           url: https://review.lttng.org/binutils-gdb
@@ -114,22 +126,8 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
 
-    node: 'master'
-    axes:
-      - axis:
-         type: slave
-         name: arch
-         values: '{obj:arch}'
-      - axis:
-         type: user-defined
-         name: target_board
-         values: '{obj:target_board}'
-
-    builders:
-      - shell:
-         !include-raw-escape:
-           - scripts/common/print.sh
-           - scripts/binutils-gdb/build.sh
+    <<: *binutils-gdb_matrix_axes_defaults
+    <<: *binutils-gdb_builders_defaults
 
     publishers:
       - archive:
@@ -137,17 +135,24 @@
           allow-empty: false
       - junit:
           results: 'results/*.xml'
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
 
     properties:
       - build-discarder:
-          days-to-keep: 1
+          days-to-keep: 7
+      - throttle:
+          option: 'category'
+          categories:
+            - 'review-binutils-gdb'
 
 
 ## Views ##
 - view-template:
     name: 'GDB'
     view-type: list
-    regex: 'binutils-gdb[-_].*'
+    regex: '.*binutils-gdb.*'
 
 
 ## Projects ##
@@ -156,16 +161,19 @@
     version:
       - master
     jobs:
-      - 'binutils-gdb_{version}_build':
-          arch: !!python/tuple [amd64]
-          target_board: !!python/tuple ["unix", "native-gdbserver", "native-extended-gdbserver"]
+      - 'binutils-gdb_{version}_linuxbuild':
+          platforms: !!python/tuple [deb12-amd64]
+          target_boards: !!python/tuple ["unix", "native-gdbserver", "native-extended-gdbserver"]
+      - 'binutils-gdb_{version}_macosbuild':
+          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          target_boards: !!python/tuple ["unix"]
 
 - project:
-    name: gerrit-gdb
+    name: review-gdb
     jobs:
-      - 'dev_gerrit_binutils-gdb_build':
-          arch: !!python/tuple [amd64]
-          target_board: !!python/tuple ["unix", "native-gdbserver", "native-extended-gdbserver"]
+      - 'dev_review_binutils-gdb_linuxbuild':
+          platforms: !!python/tuple [deb12-amd64]
+          target_boards: !!python/tuple ["unix", "native-gdbserver", "native-extended-gdbserver"]
 
 - project:
     name: gdb-views