Skip to content

Commit

Permalink
Update notify-github to not send imdsv1 calls (#29836)
Browse files Browse the repository at this point in the history
(cherry picked from commit 691a05b)
  • Loading branch information
CelianR committed Nov 26, 2024
1 parent 71c4b3d commit f3e9fb9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 27 deletions.
1 change: 0 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ include:
- .gitlab/choco_deploy/choco_deploy.yml
- .gitlab/common/shared.yml
- .gitlab/common/skip_ci_check.yml
- .gitlab/common/pr_commenter.yml
- .gitlab/common/test_infra_version.yml
- .gitlab/container_build/include.yml
- .gitlab/container_scan/container_scan.yml
Expand Down
22 changes: 0 additions & 22 deletions .gitlab/common/pr_commenter.yml

This file was deleted.

9 changes: 5 additions & 4 deletions .gitlab/notify/notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ send_pipeline_stats:

notify_github:
stage: notify
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["arch:amd64"]
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["arch:arm64"]
rules:
- !reference [.except_mergequeue]
- !reference [.except_main_or_release_branch]
Expand All @@ -78,14 +78,15 @@ notify_github:
dependencies: []
allow_failure: true
script:
- !reference [.install_pr_commenter]
- !reference [.setup_agent_github_app]
- python3 -m pip install -r tasks/libs/requirements-github.txt
- messagefile="$(mktemp)"
- echo "Use this command from [test-infra-definitions](https://github.com/DataDog/test-infra-definitions) to manually test this PR changes on a VM:" >> "$messagefile"
- echo '```sh' >> "$messagefile"
- echo "inv create-vm --pipeline-id=$CI_PIPELINE_ID --os-family=ubuntu" >> "$messagefile"
- echo '```' >> "$messagefile"
- 'echo "Note: This applies to commit **$CI_COMMIT_SHORT_SHA**" >> "$messagefile"'
- cat "$messagefile" | /usr/local/bin/pr-commenter --for-pr="$CI_COMMIT_REF_NAME" --header="Test changes on VM"
- inv -e github.pr-commenter --title "Test changes on VM" --body "$(cat "$messagefile")" --echo
- rm "$messagefile"

notify_gitlab_ci_changes:
Expand Down

0 comments on commit f3e9fb9

Please sign in to comment.