diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-04-03 16:57:54 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-04-03 16:57:54 +0200 |
commit | 641a16be1081543e24294182b8e55e80eecbf313 (patch) | |
tree | c2ee13f8df30d35b89d806782d30e22e31b27654 | |
parent | 6299f2bf521a233f47d76fc6efa30d46aa417910 (diff) |
yum versionlock add requires --enablerepo
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java | 7 | ||||
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java index 5f7fbdd0d69..53f3a6d4900 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java @@ -101,9 +101,9 @@ public class Yum { boolean modified = false; if (!alreadyLocked) { - terminal.newCommandLine(context) - .add("yum", "versionlock", "add", targetVersionLockName) - .execute(); + CommandLine commandLine = terminal.newCommandLine(context).add("yum", "versionlock", "add"); + for (String repo : repos) commandLine.add("--enablerepo=" + repo); + commandLine.add(targetVersionLockName).execute(); modified = true; } @@ -121,7 +121,6 @@ public class Yum { var installCommand = terminal.newCommandLine(context).add("yum", "install"); for (String repo : repos) installCommand.add("--enablerepo=" + repo); installCommand.add("--assumeyes", yumPackage.toName()); - String output = installCommand.executeSilently().getUntrimmedOutput(); if (NOTHING_TO_DO_PATTERN.matcher(output).find()) { 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 c7e2885a907..f4034b38495 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 @@ -180,15 +180,18 @@ public class YumTest { terminal.expectCommand("yum versionlock delete \"0:package-1-0.1-8.el7.*\" 2>&1"); - terminal.expectCommand("yum versionlock add \"0:package-1-0.10-654.el7.*\" 2>&1"); + terminal.expectCommand("yum versionlock add --enablerepo=somerepo \"0:package-1-0.10-654.el7.*\" 2>&1"); terminal.expectCommand( - "yum install --assumeyes 0:package-1-0.10-654.el7 2>&1", + "yum install --enablerepo=somerepo --assumeyes 0:package-1-0.10-654.el7 2>&1", 0, "Nothing to do\n"); - assertTrue(yum.installFixedVersion(taskContext, YumPackageName.fromString("0:package-1-0.10-654.el7"))); + assertTrue(yum.installFixedVersion( + taskContext, + YumPackageName.fromString("0:package-1-0.10-654.el7"), + "somerepo")); } @Test |