diff --git a/.github/workflows/create_rc_pr.yml b/.github/workflows/create_rc_pr.yml index 202d1f95dea684..156c4b64fbc7b9 100644 --- a/.github/workflows/create_rc_pr.yml +++ b/.github/workflows/create_rc_pr.yml @@ -8,8 +8,6 @@ on: - cron: '0 9 * * 1' # Run Agent 6 workflow on Monday at 09:00 UTC env: - DD_API_KEY: ${{ secrets.DD_API_KEY }} - DD_APP_KEY: ${{ secrets.DD_APP_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} AGENT6_RELEASE_BRANCH: '6.53.x' AGENT_CI_ONCALL_CHANNEL: 'C085P12CTFX' @@ -62,6 +60,10 @@ jobs: fi - name: Check if an Agent 6 build pipeline has run in the past week if: ${{ env.IS_AGENT6_RELEASE == 'true' }} + env: + DD_SITE: 'datadoghq.com' + DD_API_KEY: ${{ secrets.DD_API_KEY }} + DD_APP_KEY: ${{ secrets.DD_APP_KEY }} run: | err_msg=$(inv release.check-agent6-build-status ${{ env.AGENT_CI_ONCALL_CHANNEL }}) if [-n "$err_msg" ]; then diff --git a/tasks/release.py b/tasks/release.py index 67c15a3553b9c1..e2bafd7bb9e460 100644 --- a/tasks/release.py +++ b/tasks/release.py @@ -1286,6 +1286,7 @@ def check_agent6_build_status(ctx, channel_id): """ Checks if there is an agent 6 build pipeline in the last week """ + print(f"DDSITE: {os.environ.get('DD_SITE')}") dd_site = os.environ.get("DD_SITE", "datadoghq.com") configuration = Configuration(host=f"https://api.{dd_site}") with ApiClient(configuration) as api_client: @@ -1296,7 +1297,7 @@ def check_agent6_build_status(ctx, channel_id): filter_to=datetime.now(), page_limit=5, ) - print(configuration.host) + print(f"CONFIG HOST: {configuration.host}") if not response.data: err_msg = "AGENT 6 ERROR: No Agent 6 build pipelines have run in the past week. Please trigger a build pipeline for the next agent 6 release candidate." send_slack_msg(ctx, channel_id, err_msg)