diff --git a/.github/workflows/test_deployment_rhel.yml b/.github/workflows/test_deployment_rhel.yml index 7424e58..335cf66 100644 --- a/.github/workflows/test_deployment_rhel.yml +++ b/.github/workflows/test_deployment_rhel.yml @@ -89,13 +89,14 @@ jobs: make test/vm ISO_NAME=${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso \ VM_IP=${VM_IP} VM_PORT=${VM_PORT} VM_USER=${VM_USER} VM_PASS=${VM_PASS} \ ARCH=${{ needs.load_vars.outputs.ARCH}} \ + ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} \ IMAGE_NAME=${{ needs.load_vars.outputs.IMAGE_NAME}} \ IMAGE_REPO=${{ needs.load_vars.outputs.IMAGE_REPO}} \ IMAGE_TAG=${{ matrix.version }} \ - VERSION=${{ matrix.version }} \ - VARIANT=${{ needs.load_vars.outputs.VARIANT }} \ + REPOS=/etc/yum.repos.d/redhat.repo \ SECURE_BOOT_KEY_URL=${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} \ - ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} + VARIANT=${{ needs.load_vars.outputs.VARIANT }} \ + VERSION=${{ matrix.version }} - name: Set status if: inputs.pr && always() diff --git a/test/vm/Makefile b/test/vm/Makefile index 1c3ef4b..69e85e1 100644 --- a/test/vm/Makefile +++ b/test/vm/Makefile @@ -32,7 +32,7 @@ files/mnt/iso: sudo mount -o loop ../../$(ISO_NAME) files/mnt/iso files/grub.cfg: files/mnt/iso - cp files/mnt/iso/boot/grub2/grub.cfg files/grub.cfg + cp files/mnt/iso/boot/$(if $(_RHEL),isolinux/grub.conf,grub2/grub.cfg) files/grub.cfg sed -i 's/quiet/console=ttyS0,115200n8 inst.ks=cdrom:\/ks.cfg/' files/grub.cfg sed -i 's/set default="1"/set default="0"/' files/grub.cfg sed -i 's/set timeout=60/set timeout=1/' files/grub.cfg @@ -57,7 +57,7 @@ files/install.iso: files/grub.cfg -compliance joliet_long_names -map files/ks.cfg ks.cfg -chmod 0444 ks.cfg - -map files/grub.cfg boot/grub2/grub.cfg + -map files/grub.cfg boot/$(if $(_RHEL),isolinux/grub.conf,grub2/grub.cfg) -end EOF