update hashrelease pipeline

projectcalico · Feb 10, 2025 · 5d65004 · 5d65004
1 parent ac0c741
commit 5d65004
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 2 deletions.
diff --git a/.semaphore/release/hashrelease.yml b/.semaphore/release/hashrelease.yml
@@ -47,7 +47,6 @@ blocks:
       jobs:
         - name: Build and publish hashrelease
           commands:
-            - if [[ ${SEMAPHORE_WORKFLOW_TRIGGERED_BY_SCHEDULE} == "true" ]]; then export BUILD_CONTAINER_IMAGES=true; export PUBLISH_IMAGES=true; fi
             - make hashrelease
       prologue:
         commands:

diff --git a/.semaphore/semaphore-scheduled-builds.yml b/.semaphore/semaphore-scheduled-builds.yml
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
diff --git a/.semaphore/semaphore.yml.d/03-promotions.yml b/.semaphore/semaphore.yml.d/03-promotions.yml
@@ -2,6 +2,22 @@ promotions:
   # Manual promotion for publishing a hashrelease.
   - name: Publish hashrelease
     pipeline_file: release/hashrelease.yml
+    parameters:
+      env_vars:
+        - required: true
+          options:
+            - "true"
+            - "false"
+          default_value: "false"
+          description: "Set to 'true' to build images while building the hashrelease. Must set PUBLISH_IMAGES to 'true' to publish them."
+          name: BUILD_CONTAINER_IMAGES
+        - required: true
+          options:
+            - "true"
+            - "false"
+          default_value: "false"
+          description: "Set to 'true' to publish images built by the hashrelease. Requires BUILD_CONTAINER_IMAGES to be 'true'."
+          name: PUBLISH_IMAGES
   # Manual promotion for publishing a release.
   - name: Publish official release
     pipeline_file: release/release.yml

diff --git a/release/internal/ci/semaphore.go b/release/internal/ci/semaphore.go
@@ -94,7 +94,7 @@ func getPipelineResult(orgURL, pipelineID, token string) (*pipeline, error) {
 }
 
 func ImagePromotionsDone(repoRootDir, orgURL, pipelineID, token string) (bool, error) {
-	expectPromotionCountStr, err := command.Run("grep", []string{"-c", `"name: Push "`, fmt.Sprintf("%s/.semaphore/semaphore.yml.d/03-promotions.yml")})
+	expectPromotionCountStr, err := command.Run("grep", []string{"-c", `"name: Push "`, fmt.Sprintf("%s/.semaphore/semaphore.yml.d/03-promotions.yml", repoRootDir)})
 	if err != nil {
 		return false, fmt.Errorf("failed to get expected image promotions")
 	}