jjb: babeltrace: cleanup anchor labels

Change-Id: I958f04c6b7f50eb83aac54293be258e2e0b2fa02
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index c7b0c662b2195c71606d5ae0ee70debf60a043eb..3d5b0c0906fdb98da5d25ab9589e21d8323698bd 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -60,15 +60,15 @@
         expr: '{touchstone}'
         result: unstable
     axes:
-      - axis: &babeltrace_build_axis_arch
+      - axis: &babeltrace_matrix_axis_arch
          type: slave
          name: arch
          values: '{obj:archs}'
-      - axis: &babeltrace_build_axis_conf
+      - axis: &babeltrace_matrix_axis_conf
          type: user-defined
          name: conf
          values: '{obj:confs}'
-      - axis: &babeltrace_build_axis_build
+      - axis: &babeltrace_matrix_axis_build
          type: user-defined
          name: build
          values: '{obj:builds}'
@@ -79,10 +79,10 @@
     <<: *babeltrace_matrix_axes_defaults
 
     axes:
-      - axis: *babeltrace_build_axis_arch
-      - axis: *babeltrace_build_axis_conf
-      - axis: *babeltrace_build_axis_build
-      - axis: &babeltrace_build_axis_cc
+      - axis: *babeltrace_matrix_axis_arch
+      - axis: *babeltrace_matrix_axis_conf
+      - axis: *babeltrace_matrix_axis_build
+      - axis: &babeltrace_matrix_axis_cc
          type: user-defined
          name: cc
          values: '{obj:ccs}'
@@ -248,8 +248,8 @@
           send-to:
             - recipients
 
-- babeltrace_build_publishers_gerrit: &babeltrace_build_publishers_gerrit
-    name: 'babeltrace_build_publishers_gerrit'
+- babeltrace_publishers_gerrit: &babeltrace_publishers_gerrit
+    name: 'babeltrace_publishers_gerrit'
     publishers:
       - tap: *babeltrace_publisher_tap_defaults
       - raw: *babeltrace_publisher_warnings-ng_defaults
@@ -315,7 +315,7 @@
 
     <<: *babeltrace_matrix_axes_defaults
     <<: *babeltrace_builders_defaults
-    <<: *babeltrace_build_publishers_gerrit
+    <<: *babeltrace_publishers_gerrit
 
 - job-template:
     name: babeltrace_{version}_release