Merge branch 'master' into improve-test-around-waitForManifestStableTask

spinnaker · Feb 26, 2025 · 377e07a · 377e07a
2 parents 2379b03 + 6b45278
commit 377e07a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       # Given a tag, determine what branch we are on, so we can bump dependencies in the correct branch
       - name: Get Branch
         run: |
-          BRANCHES=$(git branch -r --contains ${{ github.ref }})
+          BRANCHES=$(git branch -r --contains ${{ github.ref }} | grep -v 'HEAD')
           echo "BRANCHES is '${BRANCHES}'"
           # Check for no branches explicitly...Otherwise echo adds a newline so wc thinks there's
           # one branch.  And echo -n makes it appears that there's one less branch than there

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-fiatVersion=1.53.0
+fiatVersion=1.54.0
 korkVersion=7.251.0
 kotlinVersion=1.6.21
 org.gradle.parallel=true

diff --git a/...in/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java b/...in/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java
@@ -92,20 +92,22 @@ public boolean processExpressions(
 
   @Override
   public void afterStages(@Nonnull StageExecution stage, @Nonnull StageGraphBuilder graph) {
-    TrafficManagement trafficManagement =
-        stage.mapTo("/trafficManagement", TrafficManagement.class);
-    if (trafficManagement.isEnabled()) {
-      switch (trafficManagement.getOptions().getStrategy()) {
-        case RED_BLACK:
-        case BLUE_GREEN:
-          oldManifestActionAppender.deleteOrDisableOldManifest(stage.getContext(), graph);
-          break;
-        case HIGHLANDER:
-          oldManifestActionAppender.disableOldManifest(stage.getContext(), graph);
-          oldManifestActionAppender.deleteOldManifest(stage.getContext(), graph);
-          break;
-        case NONE:
-          // do nothing
+    if (stage.getContext().get("trafficManagement") != null) {
+      TrafficManagement trafficManagement =
+          stage.mapTo("/trafficManagement", TrafficManagement.class);
+      if (trafficManagement.isEnabled()) {
+        switch (trafficManagement.getOptions().getStrategy()) {
+          case RED_BLACK:
+          case BLUE_GREEN:
+            oldManifestActionAppender.deleteOrDisableOldManifest(stage.getContext(), graph);
+            break;
+          case HIGHLANDER:
+            oldManifestActionAppender.disableOldManifest(stage.getContext(), graph);
+            oldManifestActionAppender.deleteOldManifest(stage.getContext(), graph);
+            break;
+          case NONE:
+            // do nothing
+        }
       }
     }
     if (shouldRemoveStageOutputs(stage)) {

diff --git a/...ava/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java b/...ava/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java
@@ -115,6 +115,14 @@ void rolloutStrategyDisabled() {
     assertThat(getAfterStages(stage)).isEmpty();
   }
 
+  @Test
+  void rolloutStrategyMissing() {
+    StageExecutionImpl stage = new StageExecutionImpl();
+    stage.setContext(getContext(DeployManifestContext.builder().build()));
+    stage.getContext().remove("trafficManagement");
+    assertThat(getAfterStages(stage)).isEmpty();
+  }
+
   @Test
   void rolloutStrategyRedBlack() {
     givenManifestIsStable();