uncomment

Author: himaja-kesari

.github/workflows/build.yml

@@ -42,30 +42,45 @@ jobs:
   build-docs:
     uses: ./.github/workflows/docs-build.yml
 
-  # tests-functional-azl3-amd64:
-  #   name: Functional tests AZL3 AMD64
-  #   if: ${{ inputs.runFunctionalTests }}
-  #   uses: ./.github/workflows/tests-functional.yml
-  #   with:
-  #     hostArch: amd64
-  #     hostDistro: azl3
-
-  # tests-functional-azl3-arm64:
-  #  name: Functional tests AZL3 ARM64
-  #  if: ${{ inputs.runFunctionalTests }}
-  #  uses: ./.github/workflows/tests-functional.yml
-  #  with:
-  #    hostArch: arm64
-  #    hostDistro: azl3
-
-  # tests-functional-ubuntu2404-amd64:
-  #   name: Functional tests Ubuntu24.04 AMD64
-  #   if: ${{ inputs.runFunctionalTests }}
-  #   uses: ./.github/workflows/tests-functional.yml
-  #   with:
-  #     hostArch: amd64
-  #     hostDistro: ubuntu2404
+  tests-functional-azl3-amd64:
+    name: Functional tests AZL3 AMD64
+    if: ${{ inputs.runFunctionalTests }}
+    uses: ./.github/workflows/tests-functional.yml
+    with:
+      hostArch: amd64
+      hostDistro: azl3
+
+  tests-functional-azl3-arm64:
+   name: Functional tests AZL3 ARM64
+   if: ${{ inputs.runFunctionalTests }}
+   uses: ./.github/workflows/tests-functional.yml
+   with:
+     hostArch: arm64
+     hostDistro: azl3
+
+  tests-functional-ubuntu2404-amd64:
+    name: Functional tests Ubuntu24.04 AMD64
+    if: ${{ inputs.runFunctionalTests }}
+    uses: ./.github/workflows/tests-functional.yml
+    with:
+      hostArch: amd64
+      hostDistro: ubuntu2404
+
+  tests-functional-ubuntu2404-arm64:
+    name: Functional tests Ubuntu24.04 ARM64
+    if: ${{ inputs.runFunctionalTests }}
+    uses: ./.github/workflows/tests-functional.yml
+    with:
+      hostArch: arm64
+      hostDistro: ubuntu2404
 
+  imagecreator-tests-functional-azl3-amd64:
+    name: Functional tests AZL3 AMD64
+    if: ${{ inputs.runFunctionalTests }}
+    uses: ./.github/workflows/imagecreator-tests-functional.yml
+    with:
+      hostArch: amd64
+      hostDistro: azl3
   tests-functional-ubuntu2404-arm64:
     name: Functional tests Ubuntu24.04 ARM64
     if: ${{ inputs.runFunctionalTests }}
@@ -82,27 +97,45 @@ jobs:
       hostArch: amd64
       hostDistro: azl3
 
-  # imagecreator-tests-functional-ubuntu2404-amd64:
-  #   name: Functional tests Ubuntu24.04 AMD64
-  #   if: ${{ inputs.runFunctionalTests }}
-  #   uses: ./.github/workflows/imagecreator-tests-functional.yml
-  #   with:
-  #     hostArch: amd64
-  #     hostDistro: ubuntu2404
-
-  # tests-vmtests-azl3-amd64:
-  #   name: VMTests suite AZL3 AMD64
-  #   if: ${{ inputs.runVMTests }}
-  #   needs: binary-build-amd64
-  #   uses: ./.github/workflows/tests-vmtests.yml
-  #   with:
-  #     hostArch: amd64
-  #     hostDistro: azl3
+  imagecreator-tests-functional-ubuntu2404-amd64:
+    name: Functional tests Ubuntu24.04 AMD64
+    if: ${{ inputs.runFunctionalTests }}
+    uses: ./.github/workflows/imagecreator-tests-functional.yml
+    with:
+      hostArch: amd64
+      hostDistro: ubuntu2404
+
+  tests-vmtests-azl3-amd64:
+    name: VMTests suite AZL3 AMD64
+    if: ${{ inputs.runVMTests }}
+    needs: binary-build-amd64
+    uses: ./.github/workflows/tests-vmtests.yml
+    with:
+      hostArch: amd64
+      hostDistro: azl3
 
   tests-vmtests-ubuntu2404-amd64:
     name: VMTests suite Ubuntu24.04 AMD64
     if: ${{ inputs.runVMTests }}
     needs: binary-build-amd64
+    uses: ./.github/workflows/tests-vmtests.yml
+    with:
+      hostArch: amd64
+      hostDistro: ubuntu2404
+
+  tests-vmtests-ubuntu2404-arm64:
+    name: VMTests suite Ubuntu24.04 ARM64
+    if: ${{ inputs.runVMTests }}
+    needs: binary-build-arm64
+    uses: ./.github/workflows/tests-vmtests.yml
+    with:
+      hostArch: arm64
+      hostDistro: ubuntu2404
+
+  tests-vmtests-imagecreator-azl3-amd64:
+    name: VMTests suite image creator AZL3 AMD64
+    if: ${{ inputs.runVMTests }}
+    needs: binary-build-amd64
     uses: ./.github/workflows/tests-vmtests-imagecreator.yml
     with:
       hostArch: amd64

.github/workflows/tests-vmtests-imagecreator.yml

@@ -88,7 +88,7 @@ jobs:
 
         curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
 
-    - name: Install VM prerequisites for VM tests (Ubuntu 24.04)
+    - name: Install prerequisites for VM tests (Ubuntu 24.04)
       if: inputs.hostDistro == 'ubuntu2404'
       run: |
         set -eux

.github/workflows/tests-vmtests.yml

@@ -133,7 +133,7 @@ jobs:
 
         pushd ./repo/test/vmtests
 
-        sudo make test \
+        sudo make test-imagecustomizer \
           IMAGE_CUSTOMIZER_CONTAINER_TAG="$CONTAINER_TAG" \
           CORE_EFI_AZL2="../../../azl-core-efi-2.0/image.vhdx" \
           CORE_EFI_AZL3="../../../azl-core-efi-3.0/image.vhdx" \

test/vmtests/vmtests/README_imagecreator_tests.md

@@ -23,8 +23,6 @@ The Image Creator tests create new Azure Linux images from scratch using the Ima
 
 - `test_create_image_efi_qcow_output()` - Creates a QCOW2 image with EFI boot
 - `test_create_image_efi_raw_output()` - Creates a RAW image with EFI boot  
-- `test_create_image_efi_vhd_output()` - Creates a VHD image with EFI boot
-- `test_create_image_efi_vhdx_output()` - Creates a VHDX image with EFI boot
 
 ## Configuration