Remove support for Yum 3

3 files changed, 9 insertions, 17 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java
index f3fa6bc65e4..abe5dc1cbb3 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java
@@ -233,17 +233,11 @@ public class YumPackageName {
         StringBuilder builder = new StringBuilder();
         boolean isBare = version.isEmpty() && release.isEmpty() && architecture.isEmpty();
         char nextDelimiter;
-        if (yumVersion.getMajor() < 4) {
-            epoch.ifPresent(ep -> builder.append(ep).append(':'));
-            builder.append(name);
-            nextDelimiter = '-';
-        } else {
-            builder.append(name);
-            // Fully versioned package names must always include epoch in Yum 4
-            epoch.or(() -> Optional.of("0").filter(v -> !isBare))
-                 .ifPresent(ep -> builder.append('-').append(ep));
-            nextDelimiter = ':';
-        }
+        builder.append(name);
+        // Fully versioned package names must always include epoch in Yum 4
+        epoch.or(() -> Optional.of("0").filter(v -> !isBare))
+             .ifPresent(ep -> builder.append('-').append(ep));
+        nextDelimiter = ':';
         version.ifPresent(s -> builder.append(nextDelimiter).append(s));
         release.ifPresent(s -> builder.append('-').append(s));
         architecture.ifPresent(arch -> builder.append('.').append(arch));
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java
index e47d71cbdf7..a73f5d04704 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java
@@ -20,7 +20,7 @@ public class YumTester extends Yum {
     private final Version yumVersion;
 
     public YumTester(TestTerminal terminal) {
-        this(terminal, YumVersion.rhel7);
+        this(terminal, YumVersion.rhel8);
     }
 
     public YumTester(TestTerminal terminal, YumVersion yumVersion) {
@@ -130,11 +130,10 @@ public class YumTester extends Yum {
 
         @Override
         public YumTester andReturn(boolean value) {
-            // Pretend package is already correctly version locked to simplify expectations
+            // Pretend package is already correctly version-locked to simplify expectations
             terminal.expectCommand("yum --version 2>&1", 0, yumVersion.toFullString() + "\ntrailing garbage\n");
 
-            String quiet = yumVersion.getMajor() < 4 ? " --quiet" : "";
-            terminal.expectCommand("yum" + quiet +" versionlock list 2>&1", 0, packages.get(0).toVersionLockName(yumVersion));
+            terminal.expectCommand("yum versionlock list 2>&1", 0, packages.get(0).toVersionLockName(yumVersion));
             return super.andReturn(value);
         }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumVersion.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumVersion.java
index b0c2805d620..8eba4561805 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumVersion.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumVersion.java
@@ -4,13 +4,12 @@ package com.yahoo.vespa.hosted.node.admin.task.util.yum;
 import com.yahoo.component.Version;
 
 /**
- * Red Hat versions and their associated Yum major version.
+ * Red Hat versions and their associated Yum/DNF major version.
  *
  * @author mpolden
  */
 public enum YumVersion {
 
-    rhel7(3),
     rhel8(4);
 
     private final Version version;