summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-09-10 11:18:40 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-09-10 11:18:40 +0200
commita5b4e7b6634ebf28b8751339996730422a25e97d (patch)
treed3f57f3892fd61707fb85ba310219c6e8d7d2259 /configserver
parent2fa6e7bf394d85aad43629742dcb1fb328172202 (diff)
Use isTester in InstanceName, rather than regex on its value
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 053a36dfe75..79a8a3d8763 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -694,7 +694,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
static Version decideVersion(ApplicationId application, Environment environment, Version sessionVersion, boolean bootstrap) {
if ( environment.isManuallyDeployed()
&& ! "hosted-vespa".equals(application.tenant().value()) // Never change version of system applications
- && ! application.instance().value().endsWith("-t") // Never upgrade tester containers
+ && ! application.instance().isTester() // Never upgrade tester containers
&& ! bootstrap) { // Do not use current version when bootstrapping config server
return Vtag.currentVersion;
}