Allow OsUpgrader to upgrade main (#6933)

2 files changed, 0 insertions, 34 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java
index a83c9cdf06f..7f3b2400736 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.maintenance;
 
 import com.google.common.collect.ImmutableSet;
 import com.yahoo.component.Version;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.CloudName;
@@ -39,12 +38,6 @@ public class OsUpgrader extends InfrastructureUpgrader {
     }
 
     @Override
-    protected void maintain() {
-        if (controller().system() != SystemName.cd) return; // TODO: Enable in all systems
-        super.maintain();
-    }
-
-    @Override
     protected void upgrade(Version target, SystemApplication application, ZoneId zone) {
         if (wantedVersion(zone, application, target).equals(target)) {
             return;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
index 045386dd93a..74f7ab7faf2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
@@ -119,33 +119,6 @@ public class OsUpgraderTest {
                                                         .allMatch(node -> node.version().equals(version1)));
     }
 
-    // TODO: Remove once enabled in all systems
-    @Test
-    public void os_upgrade_in_main_does_nothing() {
-        OsUpgrader osUpgrader = osUpgrader(
-                UpgradePolicy.create()
-                             .upgrade(zone1)
-                             .upgradeInParallel(zone2, zone3)
-                             .upgrade(zone4),
-                SystemName.main
-        );
-
-        // Bootstrap system
-        tester.configServer().bootstrap(Arrays.asList(zone1, zone2, zone3, zone4, zone5),
-                                        singletonList(SystemApplication.zone),
-                                        Optional.of(NodeType.host));
-
-        // New OS is released
-        CloudName cloud = CloudName.defaultName();
-        Version version1 = Version.fromString("7.1");
-        tester.controller().upgradeOsIn(cloud, version1);
-        statusUpdater.maintain();
-
-        // Nothing happens as main is explicitly disabled
-        osUpgrader.maintain();
-        assertWanted(Version.emptyVersion, SystemApplication.zone, zone1);
-    }
-
     private List<OsVersionStatus.Node> nodesOn(Version version) {
         return tester.controller().osVersionStatus().versions().entrySet().stream()
                      .filter(entry -> entry.getKey().version().equals(version))