Choose cloud account from newest deployment spec for test and staging

2 files changed, 5 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index bac2c0ab9d7..6d746c85d72 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -682,7 +682,9 @@ public class ApplicationController {
             if (testerCertificate.isPresent()) {
                 operatorCertificates = Stream.concat(operatorCertificates.stream(), testerCertificate.stream()).toList();
             }
-            Supplier<Optional<CloudAccount>> cloudAccount = () -> decideCloudAccountOf(deployment, applicationPackage.truncatedPackage().deploymentSpec());
+            Supplier<Optional<CloudAccount>> cloudAccount = () -> decideCloudAccountOf(deployment,
+                                                                                       zone.environment().isTest() ? requireApplication(TenantAndApplicationId.from(application)).deploymentSpec()
+                                                                                                                   : applicationPackage.truncatedPackage().deploymentSpec());
             List<DataplaneTokenVersions> dataplaneTokenVersions = controller.dataplaneTokenService().listTokens(application.tenant());
             Supplier<Optional<EndpointCertificate>> endpointCertificateWrapper = () -> {
                 Optional<EndpointCertificate> data = endpointCertificate.get();
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 07695c17042..0ce3a3d75d4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -131,15 +131,15 @@ public class InternalStepRunner implements StepRunner {
         try {
             return switch (step.get()) {
                 case deployTester -> deployTester(id, logger);
+                case installTester -> installTester(id, logger);
                 case deployInitialReal -> deployInitialReal(id, logger);
                 case installInitialReal -> installInitialReal(id, logger);
                 case deployReal -> deployReal(id, logger);
-                case installTester -> installTester(id, logger);
                 case installReal -> installReal(id, logger);
                 case startStagingSetup -> startTests(id, true, logger);
                 case endStagingSetup -> endTests(id, true, logger);
-                case endTests -> endTests(id, false, logger);
                 case startTests -> startTests(id, false, logger);
+                case endTests -> endTests(id, false, logger);
                 case copyVespaLogs -> copyVespaLogs(id, logger);
                 case deactivateReal -> deactivateReal(id, logger);
                 case deactivateTester -> deactivateTester(id, logger);