diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-05-22 09:47:48 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-05-22 09:47:48 +0200 |
| commit | bbb2a4d2e6bdeff2fa86c08e0f5434816e1b1037 (patch) | |
| tree | ec11685d307b7d87233b0c6bc4c7f1424569a823 /controller-server/src/test/java | |
| parent | 11b0f0b29f816e9208afdc787615b9fe0e8575a1 (diff) | |
Upgrade config server together with config server host
Diffstat (limited to 'controller-server/src/test/java')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java index 7f558131dd0..d28b36265e3 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java @@ -196,11 +196,10 @@ public class SystemUpgraderTest { // System upgrades in zone 1: systemUpgrader.maintain(); - List<SystemApplication> allExceptZoneAndConfig = List.of(SystemApplication.configServerHost, - SystemApplication.proxyHost); - completeUpgrade(allExceptZoneAndConfig, version2, zone1); - systemUpgrader.maintain(); - completeUpgrade(SystemApplication.configServer, version2, zone1); + List<SystemApplication> allExceptZone = List.of(SystemApplication.configServerHost, + SystemApplication.configServer, + SystemApplication.proxyHost); + completeUpgrade(allExceptZone, version2, zone1); systemUpgrader.maintain(); completeUpgrade(SystemApplication.zone, version2, zone1); convergeServices(SystemApplication.zone, zone1); @@ -208,9 +207,7 @@ public class SystemUpgraderTest { // zone 2 and 3: systemUpgrader.maintain(); - completeUpgrade(allExceptZoneAndConfig, version2, zone2, zone3); - systemUpgrader.maintain(); - completeUpgrade(SystemApplication.configServer, version2, zone2, zone3); + completeUpgrade(allExceptZone, version2, zone2, zone3); systemUpgrader.maintain(); completeUpgrade(SystemApplication.zone, version2, zone2, zone3); convergeServices(SystemApplication.zone, zone2, zone3); @@ -218,9 +215,7 @@ public class SystemUpgraderTest { // zone 4: systemUpgrader.maintain(); - completeUpgrade(allExceptZoneAndConfig, version2, zone4); - systemUpgrader.maintain(); - completeUpgrade(SystemApplication.configServer, version2, zone4); + completeUpgrade(allExceptZone, version2, zone4); systemUpgrader.maintain(); completeUpgrade(SystemApplication.zone, version2, zone4); |