remove 7 references in rules

.gitlab/binary_build/cluster_agent.yml

@@ -4,7 +4,7 @@
   needs: ["go_mod_tidy_check"]
   script:
     - inv check-go-version
-    - inv -e cluster-agent.build --release-version "$RELEASE_VERSION_7"
+    - inv -e cluster-agent.build --release-version "$RELEASE_VERSION_6"
     - $S3_CP_CMD $CI_PROJECT_DIR/$CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent $S3_ARTIFACTS_URI/datadog-cluster-agent.$ARCH
     - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/datadog-cluster.yaml $S3_ARTIFACTS_URI/datadog-cluster.yaml
     - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/security-agent-policies $S3_ARTIFACTS_URI/security-agent-policies --recursive
@@ -15,7 +15,7 @@
 cluster_agent-build_amd64:
   extends: .cluster_agent-build_common
   rules:
-    !reference [.on_tag_or_a6]
+    !reference [.on_tag]
   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: ["go_mod_tidy_check", "go_deps"]
@@ -28,7 +28,7 @@ cluster_agent-build_amd64:
 cluster_agent-build_arm64:
   extends: .cluster_agent-build_common
   rules:
-    !reference [.on_tag_or_a6]
+    !reference [.on_tag]
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:arm64"]
   needs: ["go_mod_tidy_check", "go_deps"]

.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"]
@@ -20,5 +21,5 @@ cluster_agent_cloudfoundry-build_amd64:
     - inv -e cluster-agent-cloudfoundry.build
     - cd $CI_PROJECT_DIR/$CLUSTER_AGENT_CLOUDFOUNDRY_BINARIES_DIR
     - mkdir -p $OMNIBUS_PACKAGE_DIR
-    - export PACKAGE_VERSION=$(inv agent.version --url-safe --major-version 7)
+    - export PACKAGE_VERSION=$(inv agent.version --url-safe --major-version 6)
     - tar cf $OMNIBUS_PACKAGE_DIR/datadog-cluster-agent-cloudfoundry-$PACKAGE_VERSION-$ARCH.tar.xz datadog-cluster-agent-cloudfoundry

.gitlab/binary_build/cws_instrumentation.yml

@@ -10,7 +10,7 @@
 cws_instrumentation-build_amd64:
   extends: .cws_instrumentation-build_common
   rules:
-    !reference [.on_tag_or_a6]
+    !reference [.on_tag]
   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: ["go_mod_tidy_check", "go_deps"]
@@ -23,7 +23,7 @@ cws_instrumentation-build_amd64:
 cws_instrumentation-build_arm64:
   extends: .cws_instrumentation-build_common
   rules:
-    !reference [.on_tag_or_a6]
+    !reference [.on_tag]
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:arm64"]
   needs: ["go_mod_tidy_check", "go_deps"]

.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"]
@@ -12,12 +14,14 @@ build_dogstatsd_static-binary_x64:
     - !reference [.retrieve_linux_go_deps]
   script:
     - inv check-go-version
-    - inv -e dogstatsd.build --static --major-version 7
+    - inv -e dogstatsd.build --static --major-version 6
     - $S3_CP_CMD $CI_PROJECT_DIR/$STATIC_BINARIES_DIR/dogstatsd $S3_ARTIFACTS_URI/static/dogstatsd.$ARCH
 
 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"]
@@ -28,12 +32,14 @@ build_dogstatsd_static-binary_arm64:
     - !reference [.retrieve_linux_go_deps]
   script:
     - inv check-go-version
-    - inv -e dogstatsd.build --static --major-version 7
+    - inv -e dogstatsd.build --static --major-version 6
     - $S3_CP_CMD $CI_PROJECT_DIR/$STATIC_BINARIES_DIR/dogstatsd $S3_ARTIFACTS_URI/static/dogstatsd.$ARCH
 
 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"]
@@ -42,12 +48,12 @@ build_dogstatsd-binary_x64:
     - !reference [.retrieve_linux_go_deps]
   script:
     - inv check-go-version
-    - inv -e dogstatsd.build --major-version 7
+    - inv -e dogstatsd.build --major-version 6
     - $S3_CP_CMD $CI_PROJECT_DIR/$DOGSTATSD_BINARIES_DIR/dogstatsd $S3_ARTIFACTS_URI/dogstatsd/dogstatsd
 
 build_dogstatsd-binary_arm64:
   rules:
-    - !reference [.on_all_builds_a7]
+    - !reference [.on_all_builds]
     - !reference [.on_packaging_change]
     - !reference [.on_go-version_change]
   stage: binary_build
@@ -61,13 +67,15 @@ build_dogstatsd-binary_arm64:
     - !reference [.retrieve_linux_go_deps]
   script:
     - inv check-go-version
-    - inv -e dogstatsd.build --major-version 7
+    - inv -e dogstatsd.build --major-version 6
     - $S3_CP_CMD $CI_PROJECT_DIR/$DOGSTATSD_BINARIES_DIR/dogstatsd $S3_ARTIFACTS_URI/dogstatsd/dogstatsd.$ARCH
 
 # 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"]
@@ -76,11 +84,11 @@ build_iot_agent-binary_x64:
   script:
     - source /root/.bashrc
     - inv check-go-version
-    - inv -e agent.build --flavor iot --major-version 7
+    - inv -e agent.build --flavor iot --major-version 6
     - $S3_CP_CMD $CI_PROJECT_DIR/$AGENT_BINARIES_DIR/agent $S3_ARTIFACTS_URI/iot/agent
 
 build_iot_agent-binary_arm64:
-  rules: !reference [.on_all_builds_a7]
+  rules: !reference [.on_all_builds]
   stage: binary_build
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:arm64"]
@@ -92,12 +100,13 @@ build_iot_agent-binary_arm64:
   script:
     - source /root/.bashrc
     - inv check-go-version
-    - inv -e agent.build --flavor iot --major-version 7
+    - inv -e agent.build --flavor iot --major-version 6
 
 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"]
@@ -106,13 +115,14 @@ build_agentless_scanner-binary_x64:
     - !reference [.retrieve_linux_go_deps]
   script:
     - inv check-go-version
-    - inv -e agentless-scanner.build --major-version 7
+    - inv -e agentless-scanner.build --major-version 6
     - $S3_CP_CMD $CI_PROJECT_DIR/$AGENTLESS_SCANNER_BINARIES_DIR/agentless-scanner $S3_ARTIFACTS_URI/agentless-scanner/agentless-scanner
 
 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"]
@@ -123,5 +133,5 @@ build_agentless_scanner-binary_arm64:
     - !reference [.retrieve_linux_go_deps]
   script:
     - inv check-go-version
-    - inv -e agentless-scanner.build --major-version 7
+    - inv -e agentless-scanner.build --major-version 6
     - $S3_CP_CMD $CI_PROJECT_DIR/$AGENTLESS_SCANNER_BINARIES_DIR/agentless-scanner $S3_ARTIFACTS_URI/agentless-scanner/agentless-scanner.$ARCH

.gitlab/check_deploy/check_deploy.yml

@@ -8,7 +8,7 @@
 # overwrite a public package). To update an erroneous package, first remove it
 # from our S3 bucket.
 check_already_deployed_version_6:
-  rules: !reference [.on_deploy_a6]
+  rules: !reference [.on_deploy]
   stage: check_deploy
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS
   tags: ["arch:amd64"]
@@ -18,15 +18,3 @@ check_already_deployed_version_6:
   script:
     - cd $OMNIBUS_PACKAGE_DIR && /deploy_scripts/fail_deb_is_pkg_already_exists.sh datadog-agent_6*_amd64.deb
     - cd $OMNIBUS_PACKAGE_DIR && /deploy_scripts/fail_deb_is_pkg_already_exists.sh datadog-agent_6*_arm64.deb
-
-check_already_deployed_version_7:
-  rules: !reference [.on_deploy_a7]
-  stage: check_deploy
-  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS
-  tags: ["arch:amd64"]
-  dependencies: ["agent_deb-x64-a7", "agent_deb-arm64-a7"]
-  before_script:
-    - ls $OMNIBUS_PACKAGE_DIR
-  script:
-    - cd $OMNIBUS_PACKAGE_DIR && /deploy_scripts/fail_deb_is_pkg_already_exists.sh datadog-agent_7*_amd64.deb
-    - cd $OMNIBUS_PACKAGE_DIR && /deploy_scripts/fail_deb_is_pkg_already_exists.sh datadog-agent_7*_arm64.deb

.gitlab/choco_build/choco_build.yml

@@ -3,12 +3,12 @@
 # Contains jobs which build the chocolatey Agent package.
 
 # Not currently used in the pipeline.
-windows_choco_offline_7_x64:
+windows_choco_offline_6_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"]
+  needs: ["windows_msi_and_bosh_zip_x64-a6"]
   variables:
     ARCH: "x64"
   script:
@@ -25,12 +25,12 @@ windows_choco_offline_7_x64:
 
 # The online version of the choco job fetches the msi package from S3 so
 # it is run only once the msi package is pushed
-windows_choco_online_7_x64:
+windows_choco_online_6_x64:
   rules:
-    !reference [.on_deploy_stable_or_beta_repo_branch_a7_manual]
+    !reference [.on_deploy_stable_or_beta_repo_branch_manual]
   stage: choco_build
   tags: ["runner:windows-docker", "windowsversion:1809"]
-  needs: ["deploy_staging_windows_tags-7"]
+  needs: ["deploy_staging_windows_tags-6"]
   variables:
     ARCH: "x64"
   script:

.gitlab/choco_deploy/choco_deploy.yml

@@ -2,11 +2,11 @@
 # choco_build stage
 # Contains a job which deploys the chocolatey Agent package.
 
-publish_choco_7_x64:
-  rules: !reference [.on_deploy_stable_or_beta_repo_branch_a7_manual]
+publish_choco_6_x64:
+  rules: !reference [.on_deploy_stable_or_beta_repo_branch_manual]
   stage: choco_deploy
   tags: ["runner:windows-docker", "windowsversion:1809"]
-  needs: ["windows_choco_online_7_x64"]
+  needs: ["windows_choco_online_6_x64"]
   variables:
     ARCH: "x64"
   before_script: