X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Fbinutils-gdb.yaml;h=28fcf9b92d9201685ec747faca53fd081d422088;hb=1f14ee5ac90bd7d4d7ccfcd436022ddd36e22a30;hp=f30f4fd39ff8328b84688a2028ae9726566b3727;hpb=8381b5ca62add41d542540585596ac2c52cdc2d1;p=lttng-ci.git

diff --git a/jobs/binutils-gdb.yaml b/jobs/binutils-gdb.yaml
index f30f4fd..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,34 +38,69 @@
           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}'
-
+         name: platform
+         values: '{obj:platforms}'
+      - axis: &binutils-gdb_matrix_axis_target_board
+         type: user-defined
+         name: 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'
+
+- job-template:
+    name: binutils-gdb_{version}_macosbuild
+    defaults: binutils-gdb
+
+    <<: *binutils-gdb_matrix_axes_defaults
+    <<: *binutils-gdb_builders_defaults
+
+    publishers:
+      - 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
 
@@ -91,24 +126,33 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**'
 
-    node: 'amd64'
+    <<: *binutils-gdb_matrix_axes_defaults
+    <<: *binutils-gdb_builders_defaults
 
-    builders:
-      - shell:
-         !include-raw-escape:
-           - scripts/common/print.sh
-           - scripts/binutils-gdb/build.sh
+    publishers:
+      - archive:
+          artifacts: 'results/**'
+          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 ##
@@ -117,13 +161,19 @@
     version:
       - master
     jobs:
-      - 'binutils-gdb_{version}_build':
-          arch: !!python/tuple [amd64]
+      - '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'
+      - 'dev_review_binutils-gdb_linuxbuild':
+          platforms: !!python/tuple [deb12-amd64]
+          target_boards: !!python/tuple ["unix", "native-gdbserver", "native-extended-gdbserver"]
 
 - project:
     name: gdb-views