Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[backport][gitlab] contaiener_deploy: fix missing targets #30790 #30810

Merged
merged 1 commit into from
Nov 6, 2024
Merged

[backport][gitlab] contaiener_deploy: fix missing targets #30790 #30810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions .gitlab/deploy_containers/deploy_containers_a7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading