update tag for almalinux test image

switch to use alma vs almalinux Signed-off-by: Christina Waldron <[email protected]>
project-copacetic · Jan 29, 2025 · fb1f447 · fb1f447
1 parent 3af54af
commit fb1f447
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/integration/fixtures/test-images.json b/integration/fixtures/test-images.json
@@ -187,7 +187,7 @@
     },
     {
         "image": "docker.io/almalinux",
-        "tag": "9.4",
+        "tag": "9.4-20240923",
         "digest": "sha256:1c718a4cd7bab3bdb069ddbbd1eb593a390e6932d51d0048a2f6556303bafba7",
         "distro": "AlmaLinux",
         "description": "Valid rpm DB, microdnf & rpm present",

diff --git a/pkg/patch/patch.go b/pkg/patch/patch.go
@@ -175,7 +175,7 @@ func patchWithContext(ctx context.Context, ch chan error, image, reportFile, pat
 				"Please use a different RPM-based image")
 			return err
 
-		case strings.Contains(solveOpt.SourcePolicy.Rules[0].Updates.Identifier, "almalinux"):
+		case strings.Contains(solveOpt.SourcePolicy.Rules[0].Updates.Identifier, "alma"):
 			err = errors.New("AlmaLinux is not supported via source policies due to BusyBox not being in the AlmaLinux repos\n" +
 				"Please use a different RPM-based image")
 			return err
@@ -348,8 +348,8 @@ func getOSType(ctx context.Context, osreleaseBytes []byte) (string, error) {
 		return "rocky", nil
 	case strings.Contains(osType, "oracle"):
 		return "oracle", nil
-	case strings.Contains(osType, "almalinux"):
-		return "almalinux", nil
+	case strings.Contains(osType, "alma"):
+		return "alma", nil
 	default:
 		log.Error("unsupported osType ", osType)
 		return "", errors.ErrUnsupported

diff --git a/pkg/patch/patch_test.go b/pkg/patch/patch_test.go
@@ -267,7 +267,7 @@ func TestGetOSType(t *testing.T) {
 			REDHAT_SUPPORT_PRODUCT="AlmaLinux"
 			REDHAT_SUPPORT_PRODUCT_VERSION="9.4"`),
 			err:            nil,
-			expectedOSType: "almalinux",
+			expectedOSType: "alma",
 		},
 	}
 

diff --git a/pkg/pkgmgr/pkgmgr.go b/pkg/pkgmgr/pkgmgr.go
@@ -40,7 +40,7 @@ func GetPackageManager(osType string, osVersion string, config *buildkit.Config,
 			workingFolder: workingFolder,
 			osVersion:     osVersion,
 		}, nil
-	case "cbl-mariner", "azurelinux", "centos", "oracle", "redhat", "rocky", "amazon", "almalinux":
+	case "cbl-mariner", "azurelinux", "centos", "oracle", "redhat", "rocky", "amazon", "alma":
 		return &rpmManager{
 			config:        config,
 			workingFolder: workingFolder,