chore: logical sorting and better naming

Author: apiarian-datadog

.gitlab/datasources/flavors.yaml

@@ -1,43 +1,43 @@
 flavors:
   - name: amd64
     arch: amd64
-    needs_code_checks: true
-    suffix: amd64
     alpine: 0
+    needs_code_checks: true
     needs_layer_publish: true
+    suffix: amd64
 
   - name: arm64
     arch: arm64
-    needs_code_checks: true
-    suffix: arm64
     alpine: 0
+    needs_code_checks: true
     needs_layer_publish: true
+    suffix: arm64
 
   - name: amd64, alpine
     arch: amd64
-    needs_code_checks: false
-    suffix: amd64-alpine
     alpine: 1
+    needs_code_checks: false
     needs_layer_publish: false
+    suffix: amd64-alpine
 
   - name: arm64, alpine
     arch: arm64
-    needs_code_checks: false
-    suffix: arm64-alpine
     alpine: 1
+    needs_code_checks: false
     needs_layer_publish: false
+    suffix: arm64-alpine
 
 # Unfortunately our mutli-arch images don't fit nicely into the flavors
 # structure above.
 multi_arch_image_flavors:
   - name: basic
-    dependency_names: [amd64, arm64]
-    platform: linux/amd64,linux/arm64
     alpine: 0
+    platform: linux/amd64,linux/arm64
+    dependency_names: [amd64, arm64]
     suffix: ""
 
   - name: alpine
-    dependency_names: ["amd64, alpine", "arm64, alpine"]
-    platform: linux/amd64,linux/arm64
     alpine: 1
+    platform: linux/amd64,linux/arm64
+    dependency_names: ["amd64, alpine", "arm64, alpine"]
     suffix: "-alpine"

.gitlab/templates/pipeline.yaml.tpl

@@ -2,8 +2,8 @@ stages:
   - test
   - compile
   - build
-  - sign
   - self-monitoring
+  - sign
   - publish
 
 default:
@@ -256,7 +256,7 @@ publish private images ({{ $multi_arch_image_flavor.name }}):
 
 {{ end }} # end environments
 
-build images ({{ $multi_arch_image_flavor.name }}):
+image ({{ $multi_arch_image_flavor.name }}):
   stage: build
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10
@@ -277,12 +277,12 @@ build images ({{ $multi_arch_image_flavor.name }}):
   script:
     - .gitlab/scripts/build_image.sh
 
-publish images ({{ $multi_arch_image_flavor.name }}):
+publish image ({{ $multi_arch_image_flavor.name }}):
   stage: publish
   rules:
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   needs:
-    - build images ({{ $multi_arch_image_flavor.name }})
+    - image ({{ $multi_arch_image_flavor.name }})
   when: manual
   trigger:
     project: DataDog/public-images