default '--disablerepo=*'

2 files changed, 11 insertions, 7 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 ead99b106c2..424791bdabf 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
@@ -34,8 +34,8 @@ public abstract class YumCommand<T extends YumCommand<T>> {
             PACKAGE_NAME_BUILDERS_GENERATOR = builder -> List.of(
             builder::setName, builder::setEpoch, builder::setVersion, builder::setRelease, builder::setArchitecture);
 
-    private List<String> enabledRepos = List.of();
     private List<String> disabledRepos = List.of();
+    private List<String> enabledRepos = List.of();
     private final Terminal terminal;
 
     protected YumCommand(Terminal terminal) {
@@ -58,7 +58,11 @@ public abstract class YumCommand<T extends YumCommand<T>> {
 
     protected void addParametersToCommandLine(CommandLine commandLine) {
         commandLine.add("--assumeyes");
-        disabledRepos.forEach(repo -> commandLine.add("--disablerepo=" + repo));
+        if (!enabledRepos.isEmpty() && disabledRepos.isEmpty()) {
+            commandLine.add("--disablerepo=*");
+        } else {
+            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 8c9e36abb32..e52dedbf7ef 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 --enablerepo=repo1 --enablerepo=repo2 --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
+                "yum install --assumeyes \"--disablerepo=*\" --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,7 +161,7 @@ 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",
+                "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                 0,
                 "installing, installing");
 
@@ -201,10 +201,10 @@ public class YumTest {
 
         terminal.expectCommand("yum versionlock delete \"package-0:0.1-8.el7.*\" 2>&1");
 
-        terminal.expectCommand("yum versionlock add --assumeyes --enablerepo=somerepo \"package-0:0.10-654.el7.*\" 2>&1");
+        terminal.expectCommand("yum versionlock add --assumeyes \"--disablerepo=*\" --enablerepo=somerepo \"package-0:0.10-654.el7.*\" 2>&1");
 
         terminal.expectCommand(
-                "yum install --assumeyes --enablerepo=somerepo package-0:0.10-654.el7 2>&1",
+                "yum install --assumeyes \"--disablerepo=*\" --enablerepo=somerepo package-0:0.10-654.el7 2>&1",
                 0,
                 "Nothing to do\n");
 
@@ -254,7 +254,7 @@ public class YumTest {
         assertThrows(ChildProcessFailureException.class, () -> {
             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",
+                    "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                     1,
                     "error");