From 0f97d176f6e72b900cc3b0069ba29318840dd71b Mon Sep 17 00:00:00 2001
From: Jaime Fullaondo <jaime.fullaondo@datadoghq.com>
Date: Wed, 6 Nov 2024 14:00:12 +0100
Subject: [PATCH] [gitlab] contaiener_deploy: fix missing targets (#30790)

---
 .../deploy_containers_a7.yml                  | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/.gitlab/deploy_containers/deploy_containers_a7.yml b/.gitlab/deploy_containers/deploy_containers_a7.yml
index 02191b520ceb0..5f302961e3769 100644
--- a/.gitlab/deploy_containers/deploy_containers_a7.yml
+++ b/.gitlab/deploy_containers/deploy_containers_a7.yml
@@ -49,6 +49,10 @@ include:
   extends: .docker_publish_job_definition
   stage: deploy_containers
   dependencies: []
+  before_script:
+    - if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)-ot-beta" || exit $?; fi
+    - export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-ot-beta${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-ot-beta${JMX}-arm64"
+    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${JMX}"
 
 deploy_containers-a7:
   extends: .deploy_containers-a7_external
@@ -59,6 +63,11 @@ deploy_containers-a7-ot:
   extends: .deploy_containers-a7-base-ot
   rules:
     !reference [.manual_on_deploy_auto_on_rc-ot]
+  parallel:
+    matrix:
+      - JMX:
+          - ""
+          - "-jmx"
 
 deploy_containers-a7-rc:
   extends: .deploy_containers-a7_external
@@ -73,6 +82,11 @@ deploy_containers-a7-ot-rc:
     !reference [.on_rc-ot]
   variables:
     VERSION: 7-ot-beta-rc
+  parallel:
+    matrix:
+      - JMX:
+          - ""
+          - "-jmx"
 
 deploy_containers-dogstatsd:
   extends: .docker_publish_job_definition
@@ -105,24 +119,15 @@ deploy_containers-a7-ot_internal:
   extends: .deploy_containers-a7-base-ot
   rules:
     !reference [.on_internal_final-ot]
-  before_script:
-    - if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
-    - export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-ot-beta${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-ot-beta${JMX}-arm64"
-    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}-ot-beta${JMX}"
-  parallel:
-    matrix:
-      - JMX:
-          - ""
-          - "-jmx"
+  variables:
+    JMX: "-jmx"
 
 deploy_containers-a7-ot_internal-rc:
   extends: .deploy_containers-a7-base-ot
   rules:
     !reference [.on_internal_rc-ot]
-  before_script:
-    - if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
-    - export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-ot-beta${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-ot-beta${JMX}-arm64"
-    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}-ot-beta${JMX}"
+  variables:
+    VERSION: 7-ot-beta-rc
   parallel:
     matrix:
       - JMX: