feat(ci): Merge agent 6 and 7 rules - part 1 (#24153)

.gitlab-ci.yml

@@ -404,30 +404,6 @@ workflow:
   - when: manual
     allow_failure: true
 
-.on_a6:
-  - <<: *if_mergequeue
-    when: never
-  - <<: *if_version_6
-
-.on_a6_manual:
-  - <<: *if_mergequeue
-    when: never
-  - <<: *if_version_6
-    when: manual
-    allow_failure: true
-
-.on_a7:
-  - <<: *if_mergequeue
-    when: never
-  - <<: *if_version_7
-
-.on_a7_manual:
-  - <<: *if_mergequeue
-    when: never
-  - <<: *if_version_7
-    when: manual
-    allow_failure: true
-
 .except_no_a6_or_no_a7:
   - <<: *if_mergequeue
     when: never
@@ -454,16 +430,6 @@ workflow:
     when: manual
     allow_failure: true
 
-.on_main_a6:
-  - <<: *if_not_version_6
-    when: never
-  - <<: *if_main_branch
-
-.on_main_a7:
-  - <<: *if_not_version_7
-    when: never
-  - <<: *if_main_branch
-
 .on_tag_or_a7:
   - <<: *if_mergequeue
     when: never

.gitlab/binary_build/cluster_agent_cloudfoundry.yml

@@ -1,7 +1,8 @@
 ---
 cluster_agent_cloudfoundry-build_amd64:
   rules:
-    !reference [.on_a7]
+    - !reference [.except_mergequeue]
+    - when: on_success
   stage: binary_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]

.gitlab/binary_build/linux.yml

@@ -1,7 +1,9 @@
 ---
 build_dogstatsd_static-binary_x64:
   stage: binary_build
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["lint_linux-x64", "go_deps"]
@@ -17,7 +19,9 @@ build_dogstatsd_static-binary_x64:
 
 build_dogstatsd_static-binary_arm64:
   stage: binary_build
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
   tags: ["arch:arm64"]
   needs: ["lint_linux-arm64", "go_deps"]
@@ -33,7 +37,9 @@ build_dogstatsd_static-binary_arm64:
 
 build_dogstatsd-binary_x64:
   stage: binary_build
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["lint_linux-x64", "go_deps"]
@@ -67,7 +73,9 @@ build_dogstatsd-binary_arm64:
 # IoT Agent builds to make sure the build is not broken because of build flags
 build_iot_agent-binary_x64:
   stage: binary_build
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["lint_linux-x64", "go_deps"]
@@ -97,7 +105,8 @@ build_iot_agent-binary_arm64:
 build_agentless_scanner-binary_x64:
   stage: binary_build
   rules:
-    !reference [.on_a7]
+    - !reference [.except_mergequeue]
+    - when: on_success
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   needs: ["lint_linux-x64", "go_deps"]
@@ -112,7 +121,8 @@ build_agentless_scanner-binary_x64:
 build_agentless_scanner-binary_arm64:
   stage: binary_build
   rules:
-    !reference [.on_a7]
+    - !reference [.except_mergequeue]
+    - when: on_success
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
   tags: ["arch:arm64"]
   needs: ["lint_linux-arm64", "go_deps"]

.gitlab/choco_build/choco_build.yml

@@ -5,7 +5,7 @@
 # Not currently used in the pipeline.
 windows_choco_offline_7_x64:
   rules:
-    !reference [.on_a7_manual]
+    !reference [.manual]
   stage: choco_build
   tags: ["runner:windows-docker", "windowsversion:1809"]
   needs: ["windows_msi_and_bosh_zip_x64-a7"]

.gitlab/container_build/docker_linux.yml

@@ -41,7 +41,9 @@
 # build agent6 py2 image
 docker_build_agent6:
   extends: .docker_build_job_definition_amd64
-  rules: !reference [.on_a6]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: agent_deb-x64-a6
       artifacts: false
@@ -66,7 +68,9 @@ docker_build_agent6_arm64:
 # build agent6 py2 jmx image
 docker_build_agent6_jmx:
   extends: .docker_build_job_definition_amd64
-  rules: !reference [.on_a6]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: agent_deb-x64-a6
       artifacts: false
@@ -95,7 +99,9 @@ docker_build_agent6_jmx_arm64:
 # build agent6 jmx unified image (including python3)
 docker_build_agent6_py2py3_jmx:
   extends: .docker_build_job_definition_amd64
-  rules: !reference [.on_a6]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: agent_deb-x64-a6
       artifacts: false
@@ -108,7 +114,9 @@ docker_build_agent6_py2py3_jmx:
 # build agent7 image
 docker_build_agent7:
   extends: .docker_build_job_definition_amd64
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: agent_deb-x64-a7
       artifacts: false
@@ -121,7 +129,9 @@ docker_build_agent7:
 single_machine_performance-amd64-a7:
   extends: .docker_publish_job_definition
   stage: container_build
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - docker_build_agent7
   variables:
@@ -131,7 +141,9 @@ single_machine_performance-amd64-a7:
 
 docker_build_agent7_arm64:
   extends: .docker_build_job_definition_arm64
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: agent_deb-arm64-a7
       artifacts: false
@@ -144,7 +156,9 @@ docker_build_agent7_arm64:
 # build agent7 jmx image
 docker_build_agent7_jmx:
   extends: .docker_build_job_definition_amd64
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: agent_deb-x64-a7
       artifacts: false
@@ -156,7 +170,9 @@ docker_build_agent7_jmx:
 
 docker_build_agent7_jmx_arm64:
   extends: .docker_build_job_definition_arm64
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: agent_deb-arm64-a7
       artifacts: false
@@ -215,7 +231,9 @@ docker_build_cws_instrumentation_arm64:
 # build the dogstatsd image
 docker_build_dogstatsd_amd64:
   extends: .docker_build_job_definition_amd64
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: build_dogstatsd_static-binary_x64
       artifacts: false
@@ -226,7 +244,9 @@ docker_build_dogstatsd_amd64:
 # build the dogstatsd image
 docker_build_dogstatsd_arm64:
   extends: .docker_build_job_definition_arm64
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     - job: build_dogstatsd_static-binary_arm64
       artifacts: false

.gitlab/container_build/docker_windows.yml

@@ -68,7 +68,9 @@
 .docker_build_agent7_windows_common:
   extends:
     - .docker_build_agent_windows_common
-  rules: !reference [.on_a7]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs:
     ["windows_msi_and_bosh_zip_x64-a7", "build_windows_container_entrypoint"]
   variables:
@@ -78,7 +80,9 @@
 .docker_build_agent6_windows_common:
   extends:
     - .docker_build_agent_windows_common
-  rules: !reference [.on_a6]
+  rules:
+    - !reference [.except_mergequeue]
+    - when: on_success
   needs: ["windows_msi_x64-a6", "build_windows_container_entrypoint"]
   variables:
     AGENT_ZIP: "datadog-agent-6*-x86_64.zip"

.gitlab/container_scan/container_scan.yml

@@ -66,7 +66,7 @@ scan_master-dogstatsd:
   extends: .docker_publish_job_definition
   stage: container_scan
   rules:
-    !reference [.on_main_a7]
+    !reference [.on_main]
   needs:
     - docker_build_dogstatsd_amd64
   variables:
@@ -78,7 +78,7 @@ scan_master-a6:
   extends: .docker_publish_job_definition
   stage: container_scan
   rules:
-    !reference [.on_main_a6]
+    !reference [.on_main]
   needs:
     - docker_build_agent6
     - docker_build_agent6_jmx
@@ -95,7 +95,7 @@ scan_master-a7:
   extends: .docker_publish_job_definition
   stage: container_scan
   rules:
-    !reference [.on_main_a7]
+    !reference [.on_main]
   needs:
     - docker_build_agent7
     - docker_build_agent7_jmx
@@ -112,7 +112,7 @@ dca_scan_master:
   extends: .docker_publish_job_definition
   stage: container_scan
   rules:
-    !reference [.on_main_a7]
+    !reference [.on_main]
   needs: ["docker_build_cluster_agent_amd64"]
   variables:
     IMG_REGISTRIES: dev

.gitlab/dev_container_deploy/docker_linux.yml

@@ -5,7 +5,7 @@ include:
 dev_branch-a6:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_a6_manual]
+  rules: !reference [.manual]
   needs:
     - docker_build_agent6
     - docker_build_agent6_jmx
@@ -24,7 +24,7 @@ dev_branch-a6:
 dev_branch-dogstatsd:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_a7_manual]
+  rules: !reference [.manual]
   needs:
     - docker_build_dogstatsd_amd64
     - docker_build_dogstatsd_arm64
@@ -57,7 +57,7 @@ dev_branch_multiarch-a6:
 dev_branch_multiarch-a7:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_a7_manual]
+  rules: !reference [.manual]
   needs:
     - docker_build_agent7
     - docker_build_agent7_arm64
@@ -75,7 +75,7 @@ dev_branch_multiarch-a7:
 dev_branch_multiarch-dogstatsd:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_a7_manual]
+  rules: !reference [.manual]
   needs:
     - docker_build_dogstatsd_amd64
     - docker_build_dogstatsd_arm64
@@ -87,7 +87,7 @@ dev_branch_multiarch-dogstatsd:
 dev_master-a6:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_main_a6]
+  rules: !reference [.on_main]
   needs:
     - docker_build_agent6
     - docker_build_agent6_arm64
@@ -106,7 +106,7 @@ dev_master-a6:
 dev_master-a7:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_main_a7]
+  rules: !reference [.on_main]
   needs:
     - docker_build_agent7
     - docker_build_agent7_arm64
@@ -124,7 +124,7 @@ dev_master-a7:
 dev_master-dogstatsd:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_main_a7]
+  rules: !reference [.on_main]
   needs:
     - docker_build_dogstatsd_amd64
     - docker_build_dogstatsd_arm64
@@ -136,7 +136,7 @@ dev_master-dogstatsd:
 dca_dev_branch:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_a7_manual]
+  rules: !reference [.manual]
   needs:
     - docker_build_cluster_agent_amd64
   variables:
@@ -159,7 +159,7 @@ dca_dev_branch_multiarch:
 dca_dev_master:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
-  rules: !reference [.on_main_a7]
+  rules: !reference [.on_main]
   needs:
     - docker_build_cluster_agent_amd64
   variables: