[gitlab] contaiener_deploy: address OTel feedback

DataDog · Nov 4, 2024 · c28417f · c28417f
1 parent 7f27c3d
commit c28417f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.gitlab/deploy_containers/conditions.yml b/.gitlab/deploy_containers/conditions.yml
@@ -1,5 +1,19 @@
 
 # Rule to make job manual when running deploy pipelines, or automatic and on success on RC pipelines
+#
+## Note on CI_COMMIT_TAGS
+#
+# The standard(vanilla) agent builds expect COMMIT TAGS that match the following
+# patterns:
+#    - RC: ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ (eg. 7.60.0-rc.2)
+#    - FINAL: ^[0-9]+\.[0-9]+\.[0-9]$ (eg. 7.60.0)
+#
+#
+# The OTel beta agent builds expect COMMIT TAGS that match the following
+# patterns. These tags will eventually be unrequired once GA is offered:
+#    - RC: ^[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ (eg. 7.60.0-v1.1.0-rc.2)
+#    - FINAL: ^[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+\.[0-9]+\.[0-9]+$ (eg.
+#    7.60.0-v1.1.0)
 .manual_on_deploy_auto_on_rc:
   - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
     when: manual

diff --git a/.gitlab/deploy_containers/deploy_containers_a7.yml b/.gitlab/deploy_containers/deploy_containers_a7.yml
@@ -106,7 +106,7 @@ deploy_containers-a7-ot_internal:
   rules:
     !reference [.on_internal_final-ot]
   before_script:
-    - if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --major-version 7 --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
+    - 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:
@@ -120,7 +120,7 @@ deploy_containers-a7-ot_internal-rc:
   rules:
     !reference [.on_internal_rc-ot]
   before_script:
-    - if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --major-version 7 --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
+    - 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: