Remove support for multiple Yum versions

3 files changed, 5 insertions, 75 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java
index 0341558d538..02064277f6c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java
@@ -1,7 +1,6 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.task.util.yum;
 
-import com.yahoo.component.Version;
 import org.junit.Test;
 
 import java.util.Optional;
@@ -26,7 +25,7 @@ public class YumPackageNameTest {
                 .setRelease("71.git3e8e77d.el7.centos.1")
                 .setArchitecture("x86_64")
                 .build();
-        assertEquals("docker-2:1.12.6-71.git3e8e77d.el7.centos.1.x86_64", yumPackage.toName(Version.fromString("4")));
+        assertEquals("docker-2:1.12.6-71.git3e8e77d.el7.centos.1.x86_64", yumPackage.toName());
     }
 
     @Test
@@ -115,24 +114,23 @@ public class YumPackageNameTest {
                                    String architecture,
                                    String toName,
                                    String toVersionName) {
-        YumVersion yumVersion = YumVersion.rhel8;
         YumPackageName yumPackageName = YumPackageName.fromString(packageName);
         verifyValue(epoch, yumPackageName.getEpoch());
         verifyValue(name, Optional.of(yumPackageName.getName()));
         verifyValue(version, yumPackageName.getVersion());
         verifyValue(release, yumPackageName.getRelease());
         verifyValue(architecture, yumPackageName.getArchitecture());
-        verifyValue(toName, Optional.of(yumPackageName.toName(yumVersion.asVersion())));
+        verifyValue(toName, Optional.of(yumPackageName.toName()));
 
         if (toVersionName == null) {
             try {
-                yumPackageName.toVersionLockName(yumVersion.asVersion());
+                yumPackageName.toVersionLockName();
                 fail();
             } catch (IllegalStateException e) {
                 assertThat(e.getMessage(), containsStringIgnoringCase("Version is missing "));
             }
         } else {
-            assertEquals(toVersionName, yumPackageName.toVersionLockName(yumVersion.asVersion()));
+            assertEquals(toVersionName, yumPackageName.toVersionLockName());
         }
     }
 
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 2699135b5b9..62fd7410e95 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
@@ -79,20 +79,6 @@ public class YumTest {
     @Test
     public void testAlreadyInstalled() {
         mockRpmQuery("package-1", null);
-        mockYumVersion();
-        terminal.expectCommand(
-                "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");
-
-        assertFalse(yum
-                .install("package-1", "package-2")
-                .enableRepo("repo1", "repo2")
-                .converge(taskContext));
-
-        // RHEL 8
-        mockRpmQuery("package-1", null);
-        mockYumVersion();
         terminal.expectCommand(
                 "yum install --assumeyes --enablerepo=repo1 --enablerepo=repo2 --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                 0,
@@ -104,18 +90,6 @@ public class YumTest {
 
     @Test
     public void testAlreadyUpgraded() {
-        mockYumVersion();
-        terminal.expectCommand(
-                "yum upgrade --assumeyes --setopt skip_missing_names_on_update=False package-1 package-2 2>&1",
-                0,
-                "foobar\nNo packages marked for update\n");
-
-        assertFalse(yum
-                .upgrade("package-1", "package-2")
-                .converge(taskContext));
-
-        // RHEL 8
-        mockYumVersion();
         terminal.expectCommand(
                 "yum upgrade --assumeyes --setopt skip_missing_names_on_update=False package-1 package-2 2>&1",
                 0,
@@ -128,19 +102,6 @@ public class YumTest {
     @Test
     public void testAlreadyRemoved() {
         mockRpmQuery("package-1", YumPackageName.fromString("package-1-1.2.3-1"));
-        mockYumVersion();
-        terminal.expectCommand(
-                "yum remove --assumeyes package-1 package-2 2>&1",
-                0,
-                "foobar\nNo Packages marked for removal\n");
-
-        assertFalse(yum
-                .remove("package-1", "package-2")
-                .converge(taskContext));
-
-        // RHEL 8
-        mockRpmQuery("package-1", YumPackageName.fromString("package-1-1.2.3-1"));
-        mockYumVersion();
         terminal.expectCommand(
                 "yum remove --assumeyes package-1 package-2 2>&1",
                 0,
@@ -160,7 +121,6 @@ public class YumTest {
     @Test
     public void testInstall() {
         mockRpmQuery("package-1", null);
-        mockYumVersion();
         terminal.expectCommand(
                 "yum install --assumeyes --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                 0,
@@ -181,7 +141,6 @@ public class YumTest {
     @Test
     public void testInstallWithEnablerepo() {
         mockRpmQuery("package-1", null);
-        mockYumVersion();
         terminal.expectCommand(
                 "yum install --assumeyes --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                 0,
@@ -195,23 +154,6 @@ public class YumTest {
 
     @Test
     public void testWithVersionLock() {
-        mockYumVersion();
-        terminal.expectCommand("yum versionlock list 2>&1",
-                0,
-                "Repository chef_rpms-release is listed more than once in the configuration\n" +
-                        "0:chef-12.21.1-1.el7.*\n");
-        terminal.expectCommand("yum versionlock add --assumeyes \"package-0:0.10-654.el7.*\" 2>&1");
-        terminal.expectCommand(
-                "yum install --assumeyes package-0:0.10-654.el7.x86_64 2>&1",
-                0,
-                "installing");
-
-        assertTrue(yum.installFixedVersion(YumPackageName.fromString("package-0:0.10-654.el7.x86_64")).converge(taskContext));
-    }
-
-    @Test
-    public void testWithVersionLockYum4() {
-        mockYumVersion();
         terminal.expectCommand("yum versionlock list 2>&1",
                                0,
                                "Last metadata expiration check: 0:51:26 ago on Thu 14 Jan 2021 09:39:24 AM UTC.\n");
@@ -232,7 +174,6 @@ public class YumTest {
 
     @Test
     public void testWithDifferentVersionLock() {
-        mockYumVersion();
         terminal.expectCommand("yum versionlock list 2>&1",
                 0,
                 "Repository chef_rpms-release is listed more than once in the configuration\n" +
@@ -257,7 +198,6 @@ public class YumTest {
 
     @Test
     public void testWithExistingVersionLock() {
-        mockYumVersion();
         terminal.expectCommand("yum versionlock list 2>&1",
                 0,
                 "Repository chef_rpms-release is listed more than once in the configuration\n" +
@@ -273,7 +213,6 @@ public class YumTest {
 
     @Test
     public void testWithDowngrade() {
-        mockYumVersion();
         terminal.expectCommand("yum versionlock list 2>&1",
                 0,
                 "Repository chef_rpms-release is listed more than once in the configuration\n" +
@@ -294,7 +233,6 @@ public class YumTest {
     @Test(expected = ChildProcessFailureException.class)
     public void testFailedInstall() {
         mockRpmQuery("package-1", null);
-        mockYumVersion();
         terminal.expectCommand(
                 "yum install --assumeyes --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1",
                 1,
@@ -310,7 +248,6 @@ public class YumTest {
     @Test
     public void testUnknownPackages() {
         mockRpmQuery("package-1", null);
-        mockYumVersion();
         terminal.expectCommand(
                 "yum install --assumeyes --setopt skip_missing_names_on_install=False package-1 package-2 package-3 2>&1",
                 0,
@@ -337,15 +274,10 @@ public class YumTest {
 
     @Test
     public void allowToCallUpgradeWithNoPackages() {
-        mockYumVersion();
         terminal.expectCommand("yum upgrade --assumeyes 2>&1", 0, "OK");
         yum.upgrade().converge(taskContext);
     }
 
-    private void mockYumVersion() {
-        terminal.expectCommand("yum --version 2>&1", 0, YumVersion.rhel8.asVersion().toFullString() + "\ntrailing garbage\n");
-    }
-
     private void mockRpmQuery(String packageName, YumPackageName installedOrNull) {
         new YumTester(terminal).expectQueryInstalled(packageName).andReturn(installedOrNull);
     }
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 bb4bb2686a3..93fffffb2fa 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
@@ -37,7 +37,7 @@ public class YumTesterTest {
         assertYumMethod(yum -> yum.expectRemove(packages).withEnableRepo(repos),
                 yum -> yum.remove(List.of(packages)).enableRepo(repos).converge(context));
 
-        assertYumMethod(yum -> yum.expectInstallFixedVersion(minimalPackage.toName(yum.yumVersion())).withEnableRepo(repos),
+        assertYumMethod(yum -> yum.expectInstallFixedVersion(minimalPackage.toName()).withEnableRepo(repos),
                 yum -> yum.installFixedVersion(minimalPackage).enableRepo(repos).converge(context));
     }