fix(delivery): [agent6] Use the correct registry and repository (#32900)

DataDog · Jan 13, 2025 · 37df4ce · 37df4ce
1 parent 14a7321
commit 37df4ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 29 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -438,7 +438,6 @@ workflow:
     when: on_success
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
 
 .on_deploy_manual:
@@ -505,7 +504,6 @@ workflow:
     when: on_success
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
   - when: manual
     allow_failure: true
@@ -526,7 +524,6 @@ workflow:
     variables:
       AGENT_REPOSITORY: ci/datadog-agent/agent-release
       CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
-      DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
       IMG_REGISTRIES: internal-aws-ddbuild
 
 # Same as on_deploy_manual_final, except the job is used to publish images
@@ -543,7 +540,6 @@ workflow:
     variables:
       AGENT_REPOSITORY: ci/datadog-agent/agent-release
       CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
-      DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
       IMG_REGISTRIES: internal-aws-ddbuild
 
 .on_deploy_nightly_repo_branch:

diff --git a/.gitlab/deploy_containers/conditions.yml b/.gitlab/deploy_containers/conditions.yml
@@ -6,41 +6,35 @@
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent-dev
-      DSD_REPOSITORY: dogstatsd-dev
       IMG_REGISTRIES: dev
   - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL != "true"
     when: on_success
     variables:
-      AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
+      AGENT_REPOSITORY: agent-dev
       IMG_REGISTRIES: dev
   - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL == "true"
     when: manual
     allow_failure: true
     variables:
-      AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
+      AGENT_REPOSITORY: agent-dev
       IMG_REGISTRIES: dev
   - when: manual
     allow_failure: true
     variables:
-      AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
+      AGENT_REPOSITORY: agent-dev
       IMG_REGISTRIES: dev
 
 # Rule for job that are triggered on_success on RC pipelines
 .on_rc:
   - if: $FORCE_MANUAL == "true" && $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
     when: manual
     variables:
-      AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
+      AGENT_REPOSITORY: agent-dev
       IMG_REGISTRIES: dev
   - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
     when: on_success
     variables:
-      AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
+      AGENT_REPOSITORY: agent-dev
       IMG_REGISTRIES: dev
 
 # Rule for job that can be triggered manually on final build, deploy to prod repository on stable branch deploy, else to dev repository
@@ -52,11 +46,9 @@
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent-dev
-      DSD_REPOSITORY: dogstatsd-dev
       IMG_REGISTRIES: dev
   - when: manual
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
diff --git a/tasks/unit-tests/testdata/fake_gitlab-ci.yml b/tasks/unit-tests/testdata/fake_gitlab-ci.yml
@@ -416,7 +416,6 @@ workflow:
     when: on_success
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
 
 .on_deploy_manual:
@@ -477,7 +476,6 @@ workflow:
     when: on_success
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
   - when: manual
     allow_failure: true
@@ -505,7 +503,6 @@ workflow:
     when: on_success
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
 
 .on_deploy_a7_manual:
@@ -518,13 +515,11 @@ workflow:
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent-dev
-      DSD_REPOSITORY: dogstatsd-dev
       IMG_REGISTRIES: dev
   - when: manual
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
 
 # rule to trigger job for internal image deployment if deploy is set or
@@ -554,13 +549,11 @@ workflow:
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent-dev
-      DSD_REPOSITORY: dogstatsd-dev
       IMG_REGISTRIES: dev
   - when: manual
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
 
 # This rule is a variation of on_deploy_a7_manual where
@@ -578,19 +571,16 @@ workflow:
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent-dev
-      DSD_REPOSITORY: dogstatsd-dev
       IMG_REGISTRIES: dev
   - <<: *if_rc_tag_on_beta_repo_branch
     when: on_success
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
   - when: manual
     allow_failure: true
     variables:
       AGENT_REPOSITORY: agent
-      DSD_REPOSITORY: dogstatsd
       IMG_REGISTRIES: public
 
 # This is used for image vulnerability scanning. Because agent 6
@@ -608,7 +598,6 @@ workflow:
     variables:
       AGENT_REPOSITORY: ci/datadog-agent/agent-release
       CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
-      DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
       IMG_REGISTRIES: internal-aws-ddbuild
 
 # Same as on_deploy_a7_manual_final, except the job is used to publish images
@@ -627,7 +616,6 @@ workflow:
     variables:
       AGENT_REPOSITORY: ci/datadog-agent/agent-release
       CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
-      DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
       IMG_REGISTRIES: internal-aws-ddbuild
 
 .on_deploy_nightly_repo_branch: