diff --git a/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java b/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java index eecd610053..9ad1a6c90e 100644 --- a/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java +++ b/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java @@ -157,7 +157,7 @@ private void deleteOrDisableOldManifest( (name, manifest) -> { var oldManifestIsUnstable = this.manifestOperationsHelper.previousDeploymentNeitherStableNorFailed( - manifest.getAccount(), name); + manifest.getAccount(), manifest.getNamespace(), name); var nextStageType = oldManifestIsUnstable ? DeleteManifestStage.PIPELINE_CONFIG_TYPE @@ -253,8 +253,8 @@ ImmutableList getOldManifestNames(DeployedManifest dm) { * @param name of the manifest * @return true, if manifest was not deployed correctly and waits to get stable, false otherwise */ - boolean previousDeploymentNeitherStableNorFailed(String account, String name) { - var oldManifest = this.oortService.getManifest(account, name, false); + boolean previousDeploymentNeitherStableNorFailed(String account, String location, String name) { + var oldManifest = this.oortService.getManifest(account, location, name, false); var status = oldManifest.getStatus(); var notStable = !status.getStable().isState(); diff --git a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java index bd737be2e3..5014c1f2b9 100644 --- a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java +++ b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java @@ -321,6 +321,7 @@ private void givenManifestIsNotStable() { } private void givenManifestIs(Manifest manifest) { - when(oortService.getManifest(anyString(), anyString(), anyBoolean())).thenReturn(manifest); + when(oortService.getManifest(anyString(), anyString(), anyString(), anyBoolean())) + .thenReturn(manifest); } }