Prepare for conductor based nighty builds (#32807)

DataDog · Jan 13, 2025 · a55d195 · a55d195
1 parent bba2fb6
commit a55d195
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -380,7 +380,7 @@ variables:
   if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH == "beta" && $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
 
 .if_scheduled_main: &if_scheduled_main
-  if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "main"
+  if: ($CI_PIPELINE_SOURCE == "schedule" || ($DDR_WORKFLOW_ID != null && $APPS =~ /^beta-build-/)) && $CI_COMMIT_BRANCH == "main"
 
 # Rule to trigger jobs only when a branch matches the mergequeue pattern.
 .if_mergequeue: &if_mergequeue

diff --git a/.gitlab/internal_kubernetes_deploy/internal_kubernetes_deploy.yml b/.gitlab/internal_kubernetes_deploy/internal_kubernetes_deploy.yml
@@ -12,7 +12,7 @@ internal_kubernetes_deploy_experimental:
       when: always
     - if: $CI_COMMIT_BRANCH != "main"
       when: never
-    - if: $DDR != "true"
+    - if: $DDR_WORKFLOW_ID == null
       when: never
     - if: $APPS !~ "/^datadog-agent/"
       when: never
@@ -74,7 +74,7 @@ notify-slack:
       when: always
     - if: $CI_COMMIT_BRANCH != "main"
       when: never
-    - if: $DDR != "true"
+    - if: $DDR_WORKFLOW_ID == null
       when: never
     - if: $APPS !~ "/^datadog-agent/"
       when: never

diff --git a/.gitlab/trigger_release/trigger_release.yml b/.gitlab/trigger_release/trigger_release.yml
@@ -37,8 +37,6 @@ trigger_auto_staging_release:
     AUTO_RELEASE: "true"
     TARGET_REPO: staging
   rules:
-    - if: $DDR == "true"
-      when: never
     - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+){0,1}$/
       when: never
     - !reference [.on_deploy]
@@ -73,13 +71,13 @@ generate_windows_gitlab_runner_bump_pr:
   needs: ["trigger_auto_staging_release"]
   tags: ["arch:amd64"]
   rules:
-    - if: $DDR == "true"
+    - if: $DDR_WORKFLOW_ID != null
       when: never
     - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+){0,1}$/
       when: never
     - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
 
-  script: 
+  script:
     # We are using the agent platform auto PR github app to access the buildenv repository (already used for macOS builds)
     - !reference [.setup_github_app_agent_platform_auto_pr]
     - python3 -m pip install -r requirements.txt -r tasks/libs/requirements-notifications.txt

diff --git a/tasks/libs/notify/utils.py b/tasks/libs/notify/utils.py
@@ -55,11 +55,7 @@ def should_notify(pipeline_id):
     from tasks.libs.ciproviders.gitlab_api import get_pipeline
 
     pipeline = get_pipeline(PROJECT_NAME, pipeline_id)
-    return (
-        pipeline.source != 'pipeline'
-        or pipeline.source == 'pipeline'
-        and all(var in os.environ for var in ['DDR', 'DDR_WORKFLOW_ID'])
-    )
+    return pipeline.source != 'pipeline' or pipeline.source == 'pipeline' and 'DDR_WORKFLOW_ID' in os.environ
 
 
 def get_pipeline_type(pipeline):