Merge branch 'main' into ubi

.github/dependabot.yml

@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/external" # Location of package manifests
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "lorax"

.github/workflows/bot_commands.yml

@@ -78,6 +78,22 @@ jobs:
       RH_REPO: ${{ secrets.RH_REPO }}
       RH_ENT: ${{ secrets.RH_ENT }}
 
+  run_build_iso:
+    name: Run Build ISO
+    if: >
+      github.event.issue.pull_request && 
+      contains(github.event.comment.body, '/run build iso')
+    permissions:
+      contents: read
+      packages: write
+      statuses: write
+    needs:
+      - permissions
+    uses: ./.github/workflows/build_iso.yml
+    with:
+      pr: ${{ github.event.issue.number }}
+      parent_job_name: Run Build ISO
+
   run_test_iso:
     name: Run ISO Tests
     permissions:
@@ -92,9 +108,6 @@ jobs:
     with:
       pr: ${{ github.event.issue.number }}
       parent_job_name: Run ISO Tests
-      iso_name-38: ${{ needs.load_vars.outputs.IMAGE_NAME }}-38.iso
-      iso_name-39: ${{ needs.load_vars.outputs.IMAGE_NAME }}-39.iso
-      iso_name-40: ${{ needs.load_vars.outputs.IMAGE_NAME }}-40.iso
 
   run_test_deployment:
     name: Run ISO Deployment Tests
@@ -110,6 +123,3 @@ jobs:
     with:
       pr: ${{ github.event.issue.number }}
       parent_job_name: Run ISO Deployment Tests
-      iso_name-38: ${{ needs.load_vars.outputs.IMAGE_NAME }}-38.iso
-      iso_name-39: ${{ needs.load_vars.outputs.IMAGE_NAME }}-39.iso
-      iso_name-40: ${{ needs.load_vars.outputs.IMAGE_NAME }}-40.iso

.github/workflows/build_container.yml

@@ -1,3 +1,5 @@
+name: Build Container
+
 on:
   workflow_call:
     inputs:
@@ -89,8 +91,9 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern=v{{version}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
 
       - name: Docker meta for PR
         if: inputs.pr

.github/workflows/build_iso.yml

@@ -1,3 +1,5 @@
+name: Build ISO
+
 on:
   workflow_call:
     inputs:
@@ -7,21 +9,20 @@ on:
       parent_job_name:
         required: true
         type: string
+      flatpaks_refs:
+        required: false
+        type: string
+      flatpaks_refs_dir:
+        required: false
+        type: string
+      suffix:
+        required: false
+        type: string
     secrets:
       RH_REPO: 
         required: true
       RH_ENT:
         required: true
-    outputs:
-      iso_name-38:
-        description: "Version 38 ISO Name"
-        value: ${{ jobs.build_iso.outputs.iso_name-38 }}
-      iso_name-39:
-        description: "Version 39 ISO Name"
-        value: ${{ jobs.build_iso.outputs.iso_name-39 }}
-      iso_name-40:
-        description: "Version 40 ISO Name"
-        value: ${{ jobs.build_iso.outputs.iso_name-40 }}
 
 jobs:
   load_vars:
@@ -43,19 +44,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version:
-          - 8
-          - 38
-          - 39
-          - 40
+        version: ${{ fromJson(needs.load_vars.outputs.BUILD_VERSIONS) }}
         include:
           - version: 8
             image_tag: 39
             rhel: true
-    outputs:
-      iso_name-38: ${{ steps.save_output.outputs.iso_name-38 }}
-      iso_name-39: ${{ steps.save_output.outputs.iso_name-39 }}
-      iso_name-40: ${{ steps.save_output.outputs.iso_name-40 }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -91,6 +84,22 @@ jobs:
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
 
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+          
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
       - name: Lowercase Registry
         id: registry_case
         uses: ASzc/change-string-case-action@v6
@@ -128,27 +137,22 @@ jobs:
           image_tag: ${{ matrix.image_tag || matrix.version }}
           version: ${{ matrix.version }}
           variant: ${{ needs.load_vars.outputs.VARIANT }}
-          flatpak_remote_refs_dir: ${{ ( ! matrix.rhel ) && format('/github/workspace/{0}', needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR ) || '' }}
+          flatpak_remote_refs: ${{ inputs.flatpaks_refs }}
+          flatpak_remote_refs_dir: ${{ inputs.flatpaks_refs_dir }}
           secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
           enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
-          iso_name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
+          iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
           secrets_dir: ${{ matrix.rhel && format('{0}/ubi', github.workspace) || '' }}
           repos: ${{ matrix.rhel && '/etc/yum.repos.d/redhat.repo' || '/etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo' }}
 
-      - name: Save output
-        id: save_output
-        shell: bash
-        run: |
-          echo "iso_name-${{ matrix.version }}=${{ steps.build.outputs.iso_name}}" >> $GITHUB_OUTPUT
-
       - name: Upload ISO as artifact
         id: upload
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.build.outputs.iso_name }}
+          name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}
           path: |
-            ${{ steps.build.outputs.iso_path }}
-            ${{ steps.build.outputs.iso_path }}-CHECKSUM
+            build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
+            build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso-CHECKSUM
           if-no-files-found: error
           retention-days: 0
           compression-level: 0
@@ -163,3 +167,4 @@ jobs:
           context: ${{ env.JOB_NAME }} (${{ matrix.version }})
           sha: ${{ env.sha }}
           targetUrl: ${{ steps.jobs.outputs.html_url }}
+

.github/workflows/build_vars.yml

@@ -1,8 +1,12 @@
+name: Build Vars
+
 on:
   workflow_call:
     outputs:
       ARCH:
         value: 'x86_64'
+      BUILD_VERSIONS:
+        value: '[38, 39, 40]'
       IMAGE_NAME:
         value: 'base'
       IMAGE_REPO:

.github/workflows/clean_repo.yml

@@ -0,0 +1,143 @@
+name: Clean Container Registry
+on:
+  schedule:
+    - cron: '0 21 * * 0'
+
+  workflow_dispatch:
+  
+jobs:
+  delete_untagged:
+    name: Delete Untagged Packages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete Untagged Packages
+        uses: Chizkiyahu/delete-untagged-ghcr-action@v4
+        with:
+          token: ${{ secrets.PACKAGE_DELETER }}
+          repository_owner: ${{ github.repository_owner }}
+          repository: ${{ github.repository }}
+          untagged_only: true
+          owner_type: user
+  
+  delete_old_pr:
+    name: Delete Old PR Packages
+    runs-on: ubuntu-latest
+    permissions:
+      packages: read
+    steps:
+      - name: Delete Old PR Packages
+        id: all_tags
+        run: |
+          curl -L \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ github.token }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            "https://api.github.com/user/packages/container/build-container-installer/versions" > all_packages.json
+          curl -L \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ github.token }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ github.repository }}/pulls | \
+          jq -r '.[] | select(.state == "open") | .number' | \
+          sed 's/^/pr-/g' > open_prs
+          cat << EOF | python
+          import json
+          import re
+
+          prs = open("open_prs", "r")
+          open_prs = prs.readlines()
+          open_prs = [x.strip() for x in open_prs]
+
+          all_packages = open('all_packages.json')
+          data = json.load(all_packages)
+
+          delete_versions = open("delete_versions", "w")
+
+          for i in data:
+            delete = True
+            for tag in i['metadata']['container']['tags']:
+              if not re.match('pr-.*', tag):
+                delete = False
+                continue
+              if tag in open_prs:
+                delete = False
+            if delete:
+              print("delete", i['id'])
+              delete_versions.write(str(i['id']))
+              delete_versions.write("\n")
+              print(i['metadata']['container']['tags'])
+          EOF
+          
+          for id in $(cat delete_versions)
+          do
+            curl -L \
+            -X DELETE \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.PACKAGE_DELETER }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/user/packages/container/build-container-installer/versions/${id}
+          done
+
+
+  delete_old_branches:
+    name: Delete Old Branch Packages
+    runs-on: ubuntu-latest
+    permissions:
+      packages: read
+    steps:
+      - name: Delete Old Branch Packages
+        run: |
+          curl -L \
+              -H "Accept: application/vnd.github+json" \
+              -H "Authorization: Bearer ${{ github.token }}" \
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              "https://api.github.com/user/packages/container/build-container-installer/versions" > all_packages.json
+          curl -L \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ github.token }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ github.repository }}/branches | jq -r '.[].name' > branches
+
+          cat << EOF | python
+          import json
+          import re
+
+          branches_f = open("branches", "r")
+          branches = branches_f.readlines()
+          branches = [x.strip() for x in branches]
+
+          all_packages_f = open('all_packages.json')
+          data = json.load(all_packages_f)
+
+          delete_versions = open("delete_versions", "w")
+
+          for i in data:
+            delete = True
+            for tag in i['metadata']['container']['tags']:
+              if re.match('v[0-9]+\\\.[0-9]+\\\.[0-9]+', tag):
+                delete = False
+                continue
+              if re.match('pr-.*', tag):
+                delete = False
+                continue
+              if tag in branches:
+                delete = False
+                continue
+              if tag == "latest":
+                delete = False
+            if delete:
+              print("delete", i['id'])
+              delete_versions.write(str(i['id']))
+              delete_versions.write("\n")
+              print(i['metadata']['container']['tags'])
+          EOF
+
+          for id in $(cat delete_versions)
+          do
+            curl -L \
+            -X DELETE \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.PACKAGE_DELETER }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/user/packages/container/build-container-installer/versions/${id}
+          done

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ name: Mark stale issues and pull requests
 
 on:
   schedule:
-  - cron: '39 21 * * *'
+  - cron: '0 21 * * *'
 
 jobs:
   stale:
@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v5
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'Issue is stale and will be closed in 14 days if there is no further activity'

.github/workflows/test_deployment.yml

@@ -1,3 +1,5 @@
+name: Test Deployment
+
 on:
   workflow_call:
     inputs:
@@ -7,18 +9,16 @@ on:
       parent_job_name:
         required: true
         type: string
-      iso_name-38:
-        required: true
+      flatpaks_refs:
+        required: false
         type: string
-      iso_name-39:
-        required: true
+      flatpaks_refs_dir:
+        required: false
         type: string
-      iso_name-40:
-        required: true
+      suffix:
+        required: false
         type: string
 
-
-
 jobs:
   load_vars:
     name: Load Variables
@@ -38,10 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version:
-          - 38
-          - 39
-          - 40
+        version: ${{ fromJson(needs.load_vars.outputs.BUILD_VERSIONS) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -80,98 +77,33 @@ jobs:
       - name: Install test tools
         run: |
           sudo apt-get update
-          sudo apt-get install -y make
-          sudo make install-test-deps PACKAGE_MANAGER=apt-get
+          sudo apt-get install -y unzip make
+          sudo make test/vm/install-deps PACKAGE_MANAGER=apt-get
       
       - name: Download generated ISO
         uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs[format('iso_name-{0}', matrix.version)] }}
+          name: ${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}
 
-      - name: Add Kickstart and Grub options to ISO
-        run: |
-          mv ${{ inputs[format('iso_name-{0}', matrix.version)] }} deploy.iso
-          sudo mkdir /mnt/iso || true
-          sudo mount -o loop deploy.iso /mnt/iso
-          cp /mnt/iso/boot/grub2/grub.cfg grub.cfg
-          sudo umount /mnt/iso
-          sed -i 's/quiet/console=ttyS0,115200n8 inst.ks=cdrom:\/ks.cfg/' grub.cfg
-          sed -i 's/set default="1"/set default="0"/' grub.cfg
-          sed -i 's/set timeout=60/set timeout=1/' grub.cfg
-          cat << EOF > ks.cfg
-          lang en_US.UTF-8
-          keyboard us
-          timezone Americas/New_York
-          zerombr
-          clearpart --all --initlabel
-          autopart
-          poweroff
-          user --name=core --groups=wheel --password=foobar
-          %include /usr/share/anaconda/interactive-defaults.ks
-          EOF
-          xorriso -dialog on << EOF
-          -indev deploy.iso
-          -outdev test.iso
-          -boot_image any replay
-          -map ks.cfg ks.cfg
-          -chmod 0444 ks.cfg
-          -map grub.cfg boot/grub2/grub.cfg
-          -end
-          EOF
-
-      - name: Create VM disk
-        run: |
-          qemu-img create -f qcow2 disk.qcow2 50G
-
-      - name: Install the test VM
-        run: |
-          timeout 1h qemu-system-x86_64 -name "Anaconda" -boot d -m 4096 -cpu qemu64 -display none -cdrom test.iso -smp 2 -hda disk.qcow2 -serial telnet:localhost:4321,server=on,wait=off & QEMU_PID=$!
-          echo "PID: $QEMU_PID"
-          timeout 1m bash -c "while ! (echo > /dev/tcp/127.0.0.1/4321); do sleep 0.1; done"
-          (nc localhost 4321 | tee vm.stdout) &
-          wait $QEMU_PID
-
-      - name: Start the test VM
+      - name: Run VM Tests
         env:
           VM_USER: core
           VM_PASS: foobar
           VM_IP: "127.0.0.1"
           VM_PORT: "5555"
         run: |
-          mkfifo vm.stdin
-          qemu-system-x86_64 -name "Anaconda" \
-            -m 4096 -cpu qemu64 -display none -smp 2 \
-            -chardev socket,path=/tmp/qga.sock,server=on,wait=off,id=qga0 \
-            -device e1000,netdev=net0 \
-            -netdev user,id=net0,hostfwd=tcp::${VM_PORT}-:22 \
-            -device virtio-serial \
-            -device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
-            -boot c -hda disk.qcow2 -serial telnet:localhost:4321,server=on,wait=off & export QEMU_PID=$!
-          echo "PID: $QEMU_PID"
-
-          timeout 1m bash -c "while ! (echo > /dev/tcp/127.0.0.1/4321); do sleep 0.1; done"
-          (tail -f vm.stdin | nc localhost 4321 | tee vm.stdout) &
-          
-          timeout 30m bash -c "while ! (echo > /dev/tcp/${VM_IP}/${VM_PORT}); do sleep 1; done"
-
-          if ! (echo > /dev/tcp/${VM_IP}/${VM_PORT})
-          then
-            echo "SSH must be installed and enabled inside the container"
-          fi
-          
-          echo "VM ready for tests at IP ${VM_IP}:${VM_PORT}"
-          
-          make test-vm VM_IP=${VM_IP} VM_PORT=${VM_PORT} VM_USER=${VM_USER} VM_PASS=${VM_PASS} \
+          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}} \
             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 }} \
-            FLATPAK_REMOTE_REFS_DIR=${{ needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR }} \
+            ${{ inputs.flatpaks_refs && format('FLATPAK_REMOTE_REFS="{0}"', inputs.flatpaks_refs) || '' }} \
+            ${{ inputs.flatpaks_refs_dir && format('FLATPAK_REMOTE_REFS_DIR="{0}"', inputs.flatpaks_refs_dir) || '' }} \
             SECURE_BOOT_KEY_URL=${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} \
             ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
-          kill $QEMU_PID
 
       - name: Set status
         if: inputs.pr && always()

.github/workflows/test_iso.yml

@@ -1,3 +1,5 @@
+name: Test ISO
+
 on:
   workflow_call:
     inputs:
@@ -7,16 +9,15 @@ on:
       parent_job_name:
         required: true
         type: string
-      iso_name-38:
-        required: true
+      flatpaks_refs:
+        required: false
         type: string
-      iso_name-39:
-        required: true
+      flatpaks_refs_dir:
+        required: false
         type: string
-      iso_name-40:
-        required: true
-        type: string
-      
+      suffix:
+        required: false
+        type: string   
 
 jobs:
   load_vars:
@@ -37,10 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version:
-          - 38
-          - 39
-          - 40
+        version: ${{ fromJson(needs.load_vars.outputs.BUILD_VERSIONS) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -80,31 +78,27 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y make
-          sudo make install-test-deps PACKAGE_MANAGER=apt-get
+          sudo make test/iso/install-deps PACKAGE_MANAGER=apt-get
 
       - name: Download generated ISO
         uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs[format('iso_name-{0}', matrix.version)] }}
-    
-      - name: Verify ISO
-        run: |
-          checkisomd5 ${{ inputs[format('iso_name-{0}', matrix.version)] }}
-          sha256sum -c ${{ inputs[format('iso_name-{0}', matrix.version)] }}-CHECKSUM
+          name: ${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}
 
       - name: Run ISO checks
         run: |
-          mv ${{ inputs[format('iso_name-{0}', matrix.version)] }} deploy.iso
-          make test-iso \
+          make test/iso \
             ARCH=${{ needs.load_vars.outputs.ARCH}} \
             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 }} \
-            FLATPAK_REMOTE_REFS_DIR=${{ needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR }} \
+            ${{ inputs.flatpaks_refs && format('FLATPAK_REMOTE_REFS="{0}"', inputs.flatpaks_refs) || '' }} \
+            ${{ inputs.flatpaks_refs_dir && format('FLATPAK_REMOTE_REFS_DIR="{0}"', inputs.flatpaks_refs_dir) || '' }} \
             SECURE_BOOT_KEY_URL=${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} \
-            ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
+            ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} \
+            ISO_NAME=${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
 
       - name: Set status
         if: inputs.pr && always()

.github/workflows/test_repo.yml

@@ -1,4 +1,4 @@
-name: Repo Tests
+name: Test Repo
 
 on:
   push:
@@ -24,4 +24,7 @@ jobs:
         
       - name: Run test
         run: |
-          /bin/bash tests/repo/vars.sh
+          sudo apt-get update
+          sudo apt-get install -y make
+          sudo make test/repo/install-deps
+          make test/repo

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: All Tests
 
 on:
   push:
@@ -39,6 +39,72 @@ jobs:
       RH_REPO: ${{ secrets.RH_REPO }}
       RH_ENT: ${{ secrets.RH_ENT }}
   
+  build_iso_flatpaks:
+    name: Build ISO with Flatpaks
+    needs:
+      - build_container
+    uses: ./.github/workflows/build_iso.yml
+    with:
+      pr: ${{ inputs.pr }}
+      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Build ISO with Flatpaks
+      flatpaks_refs_dir: flatpak_refs
+      suffix: flatpaks
+
+  test_iso_flatpaks:
+    name: Test ISO with Flatpaks
+    needs:
+      - build_iso_flatpaks
+    uses: ./.github/workflows/test_iso.yml
+    with:
+      pr: ${{ inputs.pr }}
+      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test ISO with Flatpaks
+      flatpaks_refs_dir: flatpak_refs
+      suffix: flatpaks
+
+  test_deployment_flatpaks:
+    name: Test Deployment with Flatpaks
+    needs:
+      - build_iso_flatpaks
+    uses: ./.github/workflows/test_deployment.yml
+    with:
+      pr: ${{ inputs.pr }}
+      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test Deployment with Flatpaks
+      flatpaks_refs_dir: flatpak_refs
+      suffix: flatpaks
+
+  build_iso_flatpak_refs:
+    name: Build ISO with Flatpak Refs
+    needs:
+      - build_container
+    uses: ./.github/workflows/build_iso.yml
+    with:
+      pr: ${{ inputs.pr }}
+      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Build ISO with Flatpak Refs
+      flatpaks_refs: "app/org.mozilla.firefox/x86_64/stable app/org.videolan.VLC/x86_64/stable"
+      suffix: flatpaks_refs
+
+  test_iso_flatpak_refs:
+    name: Test ISO with Flatpak Refs
+    needs:
+      - build_iso_flatpak_refs
+    uses: ./.github/workflows/test_iso.yml
+    with:
+      pr: ${{ inputs.pr }}
+      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test ISO with Flatpak Refs
+      flatpaks_refs: "app/org.mozilla.firefox/x86_64/stable app/org.videolan.VLC/x86_64/stable"
+      suffix: flatpaks_refs
+
+  test_deployment_flatpak_refs:
+    name: Test Deployment with Flatpak Refs
+    needs:
+      - build_iso_flatpak_refs
+    uses: ./.github/workflows/test_deployment.yml
+    with:
+      pr: ${{ inputs.pr }}
+      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test Deployment with Flatpak Refs
+      flatpaks_refs: "app/org.mozilla.firefox/x86_64/stable app/org.videolan.VLC/x86_64/stable"
+      suffix: flatpaks_refs
+
   build_iso:
     name: Build ISO
     needs:
@@ -59,9 +125,6 @@ jobs:
     with:
       pr: ${{ inputs.pr }}
       parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test ISO
-      iso_name-38: ${{ needs.build_iso.outputs.iso_name-38 }}
-      iso_name-39: ${{ needs.build_iso.outputs.iso_name-39 }}
-      iso_name-40: ${{ needs.build_iso.outputs.iso_name-40 }}
 
   test_deployment:
     name: Test Deployment
@@ -70,7 +133,4 @@ jobs:
     uses: ./.github/workflows/test_deployment.yml
     with:
       pr: ${{ inputs.pr }}
-      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test Deployment
-      iso_name-38: ${{ needs.build_iso.outputs.iso_name-38 }}
-      iso_name-39: ${{ needs.build_iso.outputs.iso_name-39 }}
-      iso_name-40: ${{ needs.build_iso.outputs.iso_name-40 }}
+      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test Deployment