summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-01-17 11:44:20 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-01-17 11:44:20 +0100
commit17cc18a0fe6a94f086d2d25d04f7d8a7030c85db (patch)
tree5766a21c796e0191ece642ffeb98420a05b8dc54 /controller-api
parentbcb8b29b2d6690054f921bb2ebfbefa1fcfec1ec (diff)
Run staging-setup tagged unit tests on initial staging deployment before upgrade
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
index f0972643bd5..ef97ef27a72 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
@@ -56,13 +56,15 @@ public interface TesterCloud {
system,
+ staging_setup,
+
staging,
production;
- public static Suite of(JobType type) {
+ public static Suite of(JobType type, boolean isSetup) {
if (type == JobType.systemTest) return system;
- if (type == JobType.stagingTest) return staging;
+ if (type == JobType.stagingTest) return isSetup ? staging_setup : staging;
if (type.isProduction()) return production;
throw new AssertionError("Unknown JobType '" + type + "'!");
}