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

feat(trigger): Update configuration to pass a branch for datadog-agent execution #748

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+39 −16
Open

feat(trigger): Update configuration to pass a branch for datadog-agent execution #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf33deb
feat(tests): Pass the branch for the datadog-agent trigger
chouetz Jan 21, 2025
fabca65
add an image to run the job
chouetz Jan 22, 2025
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
38 changes: 22 additions & 16 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,25 +358,31 @@ trigger_build_kernels:
- local: .gitlab/kernel_version_testing.yml
strategy: depend

trigger_tests:
generate_datadog_agent_trigger:
stage: test
rules:
- when: manual
allow_failure: true
tags: ["arch:arm64"]
image: registry.ddbuild.io/images/mirror/ubuntu:latest
when: manual
allow_failure: true
variables:
RUN_KITCHEN_TESTS: "false"
BUCKET_BRANCH: "dev"
DATADOG_AGENT_BUILDIMAGES: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
DATADOG_AGENT_BUILDIMAGES_SUFFIX: "${ECR_TEST_ONLY}"
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "${ECR_TEST_ONLY}"
DATADOG_AGENT_WINBUILDIMAGES: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "${ECR_TEST_ONLY}"
DATADOG_AGENT_ARMBUILDIMAGES: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "${ECR_TEST_ONLY}"
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: "v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
GIT_BRANCH: main
script:
- |
sed -i -e "s/CI_PIPELINE_ID/${CI_PIPELINE_ID}/g" \
-e "s/CI_COMMIT_SHORT_SHA/${CI_COMMIT_SHORT_SHA}/g" \
-e "s/ECR_TEST_ONLY/${ECR_TEST_ONLY}/g" \
-e "s/GIT_BRANCH/${GIT_BRANCH}/g" .gitlab/trigger_datadog_agent.yml
Comment on lines +371 to +374
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need that? Wasn't just switching the job to manual with the addition of the GIT_BRANCH variable enough?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The job was already manual. But as a trigger job, you don't have access to the UI where you can set a variable. I might be wrong though, if you have a better solution I'm happy to use it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did not know that trigger job do not let you change the value of the variable 😢

artifacts:
paths:
- .gitlab/trigger_datadog_agent.yml

trigger_datadog_agent_pipeline:
stage: test
needs: ["generate_datadog_agent_trigger"]
trigger:
project: DataDog/datadog-agent
strategy: depend
include:
- artifact: .gitlab/trigger_datadog_agent.yml
job: generate_datadog_agent_trigger

push_to_datadog_agent:
stage: test
Expand Down
17 changes: 17 additions & 0 deletions .gitlab/trigger_datadog_agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
trigger_datadog_agent:
variables:
RUN_KITCHEN_TESTS: "false"
BUCKET_BRANCH: "dev"
DATADOG_AGENT_BUILDIMAGES: "vCI_PIPELINE_ID-CI_COMMIT_SHORT_SHA"
DATADOG_AGENT_BUILDIMAGES_SUFFIX: "ECR_TEST_ONLY"
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "ECR_TEST_ONLY"
DATADOG_AGENT_WINBUILDIMAGES: "vCI_PIPELINE_ID-CI_COMMIT_SHORT_SHA"
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "ECR_TEST_ONLY"
DATADOG_AGENT_ARMBUILDIMAGES: "vCI_PIPELINE_ID-CI_COMMIT_SHORT_SHA"
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "ECR_TEST_ONLY"
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: "vCI_PIPELINE_ID-CI_COMMIT_SHORT_SHA"
trigger:
project: DataDog/datadog-agent
branch: GIT_BRANCH
strategy: depend