From 56c06cc10bd1a2bc718147fcda5e03486eb46dd8 Mon Sep 17 00:00:00 2001
From: Celene <celene@datadoghq.com>
Date: Wed, 24 Jul 2024 13:59:09 -0400
Subject: [PATCH] [gitlab] update nightly operator deployment job (#1311)

---
 .gitlab-ci.yml       | 21 +++++++++++++++------
 service.datadog.yaml |  3 ++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4577ccd6d..737c951f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -294,7 +294,7 @@ trigger_internal_operator_check_image:
 trigger_internal_operator_nightly_image:
   stage: release
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $DDR == "true" && $TARGET_ENV == "nightly-build"'
+    - if: '$CI_COMMIT_BRANCH == "main" && $TARGET_ENV == "nightly-build"'
       when: on_success
     - when: never
   trigger:
@@ -313,7 +313,7 @@ trigger_internal_operator_nightly_image:
 trigger_internal_operator_check_nightly_image:
   stage: release
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $DDR == "true" && $TARGET_ENV == "nightly-build"'
+    - if: '$CI_COMMIT_BRANCH == "main" && $TARGET_ENV == "nightly-build"'
       when: on_success
     - when: never
   trigger:
@@ -461,10 +461,11 @@ publish_community_operators:
     - make publish-community-bundles
 
 
-deploy_nightly_image:
+# On success, this will cause Conductor to trigger a Deployment to nightly clusters in SDP
+publish_nightly_workflow:
   stage: deploy
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $DDR == "true" && $TARGET_ENV == "nightly-build"'
+    - if: '$CI_COMMIT_BRANCH == "main" && $TARGET_ENV == "nightly-build"'
       when: on_success
     - when: never
   needs:
@@ -474,7 +475,15 @@ deploy_nightly_image:
     project: DataDog/k8s-datadog-agent-ops
     branch: main
     strategy: depend
+    forward:
+      pipeline_variables: true
   variables:
-    OPERATOR_NIGHTLY: true
-    ENVIRONMENTS: "alpha,experimental,staging"
+    OPERATOR_NIGHTLY: "true"
+    SKIP_PLAN_CHECK: "true"
+    ENVIRONMENTS: "experimental"
     CHART: "datadog-operator"
+    EXPLICIT_WORKFLOWS: "//workflows:deploy_operator.operator_nightly.publish"
+    BAZEL_TARGET: $BAZEL_TARGET
+    DDR: $DDR
+    TARGET_ENV: $TARGET_ENV
+    DDR_WORKFLOW_ID: $DDR_WORKFLOW_ID
diff --git a/service.datadog.yaml b/service.datadog.yaml
index a4a6938ce..6affe4ac1 100644
--- a/service.datadog.yaml
+++ b/service.datadog.yaml
@@ -48,7 +48,8 @@ extensions:
             - "staging"
           branch: "main"
           schedule: "10 3 * * SUN-THU"
-          # workflows:
+          workflows:
+            - "k8s-datadog-agent-ops/workflows/deploy_operator.operator_nightly"
         - name: "conductor-test"
           ci_pipeline: "//fake_placeholder:fake_placeholder"
           # Test branch