fix: Replaces Azure rocky-9.1 with rocky-9.3 image (#1215)

* fix: replace deleted Azure Rocky 9.1 image with 9.3 * fix: remove workaround for Rocky 9.1 on Azure --------- Co-authored-by: Dimitri Koshkin <[email protected]>
mesosphere · Oct 30, 2024 · fbf31f8 · fbf31f8
1 parent c5bf9eb
commit fbf31f8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 51 deletions.
diff --git a/.github/workflows/azure-e2e.yaml b/.github/workflows/azure-e2e.yaml
@@ -15,11 +15,11 @@ jobs:
       max-parallel: 10
       matrix:
         os:
+        - "rocky 9.3"
         - "ubuntu 20.04"
-        - "rocky 9.1"
         buildConfig:
         - "basic"
-    runs-on: 
+    runs-on:
     - self-hosted
     - medium
     continue-on-error: false
@@ -41,7 +41,7 @@ jobs:
         with:
           username: ${{ secrets.NEXUS_USERNAME }}
           password: ${{ secrets.NEXUS_PASSWORD }}
-      
+
       - name: Login to D2iQ's Mirror Registry
         uses: docker/login-action@v3
         with:

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.1"
+          - os: "rocky 9.3"
             buildConfig: "basic"
           - os: "ubuntu 20.04"
             buildConfig: "basic"

diff --git a/ansible/roles/providers/tasks/azure-redhat.yml b/ansible/roles/providers/tasks/azure-redhat.yml
@@ -15,39 +15,6 @@
 - name: import the Microsoft repository key
   command: rpm --import https://packages.microsoft.com/keys/microsoft.asc
 
-- block:
-    # TODO: remove cut utility fix to initramfs after its been fixed upstream
-    # https://bugzilla.redhat.com/show_bug.cgi?id=2165042
-    - name: expose cut utility to initramfs setup
-      shell: echo 'install_items+=" /usr/bin/cut "' > /etc/dracut.conf.d/cut.conf
-
-    - name: refresh dracut
-      shell: dracut -f
-
-    # https://d2iq.atlassian.net/browse/D2IQ-96417 removes extra 4 and 5 partitions so that growpart cloud-init module can expand the root filesystem to the rest of the disk.
-    #
-    # [packer@pkrvmia9ljyrxtg ~]$ lsblk -oMOUNTPOINT,PKNAME -P | grep 'MOUNTPOINT="/"' | cut -d= -f3  | xargs
-    # sda
-    - name: Get Device that holds root filesystem
-      shell: lsblk -oMOUNTPOINT,PKNAME -P | grep 'MOUNTPOINT="/"' | cut -d= -f3  | xargs
-      register: rootdevice
-
-    - name: Loop over ansible block devices
-      parted:
-        number: "{{ item }}"
-        state: absent
-        device: "/dev/{{ rootdevice.stdout }}"
-      with_items:
-        - 4
-        - 5
-
-    - name: unconditionally reboot the machine with all defaults
-      ansible.builtin.reboot:
-  when:
-    - packer["image_publisher"] == "erockyenterprisesoftwarefoundationinc1653071250513" and packer["image_version"] == "9.1.20230215"
-
-
-
 - name: Add the yum repository for the azure cli
   yum_repository:
     name: azure_cli

diff --git a/goss/rockylinux-x86_64 b/goss/rockylinux-x86_64
@@ -0,0 +1 @@
+rhel
diff --git a/images/azure/rocky-91.yaml b/images/azure/rocky-91.yaml
diff --git a/images/azure/rocky-93.yaml b/images/azure/rocky-93.yaml
@@ -0,0 +1,14 @@
+---
+build_name: "rocky-93-az"
+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"
+  ssh_username: "azureuser"
+  plan_image_sku: "9-base" # SKU
+  plan_image_offer: "rockylinux-x86_64" # offer
+  plan_image_publisher: "resf" # publisher
diff --git a/magefile.go b/magefile.go
@@ -55,6 +55,7 @@ var (
 		"ubuntu 22.04",
 		"rocky 9.0",
 		"rocky 9.1",
+		"rocky 9.3",
 	}
 
 	validBuildConfig = []string{