diff options
| author | jonmv <venstad@gmail.com> | 2023-08-31 08:02:18 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-08-31 11:13:31 +0200 |
| commit | fa473e7e36d1b00d20121278d9a6e6d9d2eb3113 (patch) | |
| tree | 24288a438db7ff6ef2e8d4256b7126ccd96e9bdc /controller-server | |
| parent | 06faa0b17b887877a68bb6fc3ab9431825644636 (diff) | |
Revert "Merge pull request #28291 from vespa-engine/revert-28270-jonmv/always-use-newest-cloud-account-in-tests"
This reverts commit 0b9091c4c4c992dd88ade45d0d90c5f903ed1702, reversing
changes made to a907f4488daa32f31c3240f20c7eeafb95d28ad4.
Diffstat (limited to 'controller-server')
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 7d785cea736..7136666962d 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 @@ -697,7 +697,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<DeploymentEndpoints> endpoints = () -> { if (preparedEndpoints == null) return DeploymentEndpoints.none; 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); |