fix: use Rocky 9 without a minor version for Azure (#1217)

* fix: use Rocky 9 without a minor version for Azure * fix: remove az suffix in Rocky 9 for Azure
mesosphere · Oct 30, 2024 · 8c852d6 · 8c852d6
1 parent 9fb3fa0
commit 8c852d6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/azure-e2e.yaml b/.github/workflows/azure-e2e.yaml
@@ -15,7 +15,7 @@ jobs:
       max-parallel: 10
       matrix:
         os:
-        - "rocky 9.3"
+        - "rocky 9"
         - "ubuntu 20.04"
         buildConfig:
         - "basic"

diff --git a/.github/workflows/release-azure.yaml b/.github/workflows/release-azure.yaml
@@ -16,7 +16,7 @@ jobs:
       max-parallel: 10
       matrix:
         include:
-          - os: "rocky 9.3"
+          - os: "rocky 9"
             buildConfig: "basic"
           - os: "ubuntu 20.04"
             buildConfig: "basic"

diff --git a/images/azure/rocky-93.yaml → images/azure/rocky-9.yaml b/images/azure/rocky-93.yaml → images/azure/rocky-9.yaml
@@ -1,13 +1,13 @@
 ---
-build_name: "rocky-93-az"
+build_name: "rocky-9"
 packer_builder_type: "azure"
 python_path: ""
 packer:
   distribution: "rockylinux-x86_64" # Offer
   distribution_version: "9-base"    # SKU
   # Azure Rocky linux official image: https://azuremarketplace.microsoft.com/en/marketplace/apps/resf.rockylinux-x86_64?tab=Overview
   image_publisher: "resf"
-  image_version: "9.3.20231113"
+  image_version: "latest"
   ssh_username: "azureuser"
   plan_image_sku: "9-base" # SKU
   plan_image_offer: "rockylinux-x86_64" # offer

diff --git a/magefile.go b/magefile.go
@@ -55,7 +55,7 @@ var (
 		"ubuntu 22.04",
 		"rocky 9.0",
 		"rocky 9.1",
-		"rocky 9.3",
+		"rocky 9",
 	}
 
 	validBuildConfig = []string{