Merge pull request #25279 from vespa-engine/revert-25274-revert-25247-bjormel/yum_--disablerepo

Revert "Revert "support for disablerepo in yum command""

2 files changed, 30 insertions, 8 deletions

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..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
@@ -172,6 +172,21 @@ public class YumTest {
     }
 
     @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");
+
+        assertTrue(yum
+                .install("package-1", "package-2")
+                .enableRepo("repo-name")
+                .disableRepo("*")
+                .converge(taskContext));
+    }
+
+    @Test
     void testWithVersionLock() {
         terminal.expectCommand("yum versionlock list 2>&1",
                 0,
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java
index 59c138b51df..522b85cc8b3 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java
@@ -18,6 +18,7 @@ public class YumTesterTest {
 
     private static final String[] packages = {"pkg1", "pkg2"};
     private static final String[] repos = {"repo1", "repo2"};
+    private static final String[] disablerepos = {"disablerepo1", "disablerepo2"};
     private static final YumPackageName minimalPackage = YumPackageName.fromString("pkg-1.13.1-0.el7");
     private static final YumPackageName fullPackage = YumPackageName.fromString("2:pkg-1.13.1-0.el7.x86_64");
 
@@ -27,17 +28,17 @@ public class YumTesterTest {
 
     @Test
     void generic_yum_methods() {
-        assertYumMethod(yum -> yum.expectInstall(packages).withEnableRepo(repos),
-                yum -> yum.install(List.of(packages)).enableRepo(repos).converge(context));
+        assertYumMethod(yum -> yum.expectInstall(packages).withDisableRepo(disablerepos).withEnableRepo(repos),
+                yum -> yum.install(List.of(packages)).disableRepo(disablerepos).enableRepo(repos).converge(context));
 
-        assertYumMethod(yum -> yum.expectUpdate(packages).withEnableRepo(repos),
-                yum -> yum.upgrade(List.of(packages)).enableRepo(repos).converge(context));
+        assertYumMethod(yum -> yum.expectUpdate(packages).withDisableRepo(disablerepos).withEnableRepo(repos),
+                yum -> yum.upgrade(List.of(packages)).disableRepo(disablerepos).enableRepo(repos).converge(context));
 
-        assertYumMethod(yum -> yum.expectRemove(packages).withEnableRepo(repos),
-                yum -> yum.remove(List.of(packages)).enableRepo(repos).converge(context));
+        assertYumMethod(yum -> yum.expectRemove(packages).withDisableRepo(disablerepos).withEnableRepo(repos),
+                yum -> yum.remove(List.of(packages)).disableRepo(disablerepos).enableRepo(repos).converge(context));
 
-        assertYumMethod(yum -> yum.expectInstallFixedVersion(minimalPackage.toName()).withEnableRepo(repos),
-                yum -> yum.installFixedVersion(minimalPackage).enableRepo(repos).converge(context));
+        assertYumMethod(yum -> yum.expectInstallFixedVersion(minimalPackage.toName()).withDisableRepo(disablerepos).withEnableRepo(repos),
+                yum -> yum.installFixedVersion(minimalPackage).disableRepo(disablerepos).enableRepo(repos).converge(context));
 
         // versionlock always returns success
         assertYumMethodAlwaysSuccess(yum -> yum.expectDeleteVersionLock(minimalPackage.toName()),
@@ -46,6 +47,12 @@ public class YumTesterTest {
     }
 
     @Test
+    void disable_other_repos() {
+        assertYumMethod(yum -> yum.expectInstall(packages).withDisableRepo("*").withEnableRepo(repos),
+                yum -> yum.install(List.of(packages)).disableRepo("*").enableRepo(repos).converge(context));
+    }
+
+    @Test
     void expect_query_installed() {
         yum.expectQueryInstalled(packages[0]).andReturn(fullPackage);
         assertEquals(Optional.of(fullPackage), yum.queryInstalled(context, packages[0]));