Fix nightly deploys (#7370)

randomanderson · web-flow · commit 3700064c3ef4 · 2024-07-31T09:29:50.000-04:00
* Fix nightly deploy

* always run the `build` job

* when always is needed

* nits
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,10 +17,16 @@ stages:
   - ci-visibility-tests
   - generate-signing-key
 
+workflow:
+  rules:
+    - if: $POPULATE_CACHE == "true"
+      variables:
+        SKIP_SHARED_PIPELINE: "true"
+    - when: always
+
 variables:
   REGISTRY: 486234852809.dkr.ecr.us-east-1.amazonaws.com
   BUILD_JOB_NAME: "build"
-  SKIP_SHARED_PIPELINE: $POPULATE_CACHE
 
 .common: &common
   tags: [ "runner:main", "size:large" ]
@@ -53,10 +59,6 @@ variables:
 build: &build
   <<: *gradle_build
   stage: build
-  rules:
-    - if: '$POPULATE_CACHE'
-      when: never
-    - when: on_success
   script:
     - ./gradlew clean :dd-java-agent:shadowJar :dd-trace-api:jar :dd-trace-ot:shadowJar $GRADLE_ARGS
     - echo UPSTREAM_TRACER_VERSION=$(java -jar workspace/dd-java-agent/build/libs/*.jar) >> upstream.env
@@ -82,9 +84,6 @@ build_with_cache:
     <<: *default_cache
     policy: push
 
-deploy_to_reliability_env:
-  stage: publish
-
 deploy_to_profiling_backend:
   stage: publish
   needs: [ build ]
@@ -161,6 +160,8 @@ deploy_to_sonatype:
   stage: publish
   needs: [ build ]
   rules:
+    - if: '$POPULATE_CACHE'
+      when: never
     - if: '$CI_COMMIT_BRANCH == "master"'
       when: on_success
     # Do not deploy release candidate versions
diff --git a/.gitlab/macrobenchmarks.yml b/.gitlab/macrobenchmarks.yml
@@ -1,9 +1,12 @@
 .macrobenchmarks:
   stage: macrobenchmarks
   rules:
+    - if: $POPULATE_CACHE
+      when: never
     - if: ($NIGHTLY_BENCHMARKS || $CI_PIPELINE_SOURCE != "schedule") && $CI_COMMIT_REF_NAME == "master"
       when: always
     - when: manual
+      allow_failure: true
   tags: ["runner:apm-k8s-same-cpu"]
   needs: ["build"]
   interruptible: true
