do not disable other repos by default

2 files changed, 20 insertions, 9 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java
index 424791bdabf..3c0dbdf566b 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java
@@ -58,11 +58,7 @@ public abstract class YumCommand<T extends YumCommand<T>> {
 
     protected void addParametersToCommandLine(CommandLine commandLine) {
         commandLine.add("--assumeyes");
-        if (!enabledRepos.isEmpty() && disabledRepos.isEmpty()) {
-            commandLine.add("--disablerepo=*");
-        } else {
-            disabledRepos.forEach(repo -> commandLine.add("--disablerepo=" + repo));
-        }
+        disabledRepos.forEach(repo -> commandLine.add("--disablerepo=" + repo));
         enabledRepos.forEach(repo -> commandLine.add("--enablerepo=" + repo));
     }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
index e52dedbf7ef..ba3e9238d83 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
@@ -99,7 +99,7 @@ public class YumTest {
     void testAlreadyInstalled() {
         mockRpmQuery("package-1", null);
         terminal.expectCommand(
-                "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo1 --enablerepo=repo2 --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
+                "yum install --assumeyes --enablerepo=repo1 --enablerepo=repo2 --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                 0,
                 "foobar\nNothing to do.\n"); // Note trailing dot
         assertFalse(yum.install("package-1", "package-2")
@@ -161,6 +161,20 @@ public class YumTest {
     void testInstallWithEnablerepo() {
         mockRpmQuery("package-1", null);
         terminal.expectCommand(
+                "yum install --assumeyes --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
+                0,
+                "installing, installing");
+
+        assertTrue(yum
+                .install("package-1", "package-2")
+                .enableRepo("repo-name")
+                .converge(taskContext));
+    }
+
+    @Test
+    void testInstallWithEnablerepoDisablerepo() {
+        mockRpmQuery("package-1", null);
+        terminal.expectCommand(
                 "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                 0,
                 "installing, installing");
@@ -168,6 +182,7 @@ public class YumTest {
         assertTrue(yum
                 .install("package-1", "package-2")
                 .enableRepo("repo-name")
+                .disableRepo("*")
                 .converge(taskContext));
     }
 
@@ -201,10 +216,10 @@ public class YumTest {
 
         terminal.expectCommand("yum versionlock delete \"package-0:0.1-8.el7.*\" 2>&1");
 
-        terminal.expectCommand("yum versionlock add --assumeyes \"--disablerepo=*\" --enablerepo=somerepo \"package-0:0.10-654.el7.*\" 2>&1");
+        terminal.expectCommand("yum versionlock add --assumeyes --enablerepo=somerepo \"package-0:0.10-654.el7.*\" 2>&1");
 
         terminal.expectCommand(
-                "yum install --assumeyes \"--disablerepo=*\" --enablerepo=somerepo package-0:0.10-654.el7 2>&1",
+                "yum install --assumeyes --enablerepo=somerepo package-0:0.10-654.el7 2>&1",
                 0,
                 "Nothing to do\n");
 
@@ -254,7 +269,7 @@ public class YumTest {
         assertThrows(ChildProcessFailureException.class, () -> {
             mockRpmQuery("package-1", null);
             terminal.expectCommand(
-                    "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
+                    "yum install --assumeyes --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                     1,
                     "error");