From 4ed0636e03eaad61a8ecc02ffd8294121114ea62 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:27:48 -0400 Subject: [PATCH] add test with refs --- .github/workflows/build_iso.yml | 4 +++ .github/workflows/test_deployment.yml | 6 ++++- .github/workflows/test_iso.yml | 6 ++++- .github/workflows/tests.yml | 33 +++++++++++++++++++++++ Makefile.inputs | 38 +++++++++++++-------------- 5 files changed, 66 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index e994938..c55870b 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -9,6 +9,9 @@ on: parent_job_name: required: true type: string + flatpaks_refs: + required: false + type: string flatpaks_refs_dir: required: false type: string @@ -116,6 +119,7 @@ jobs: image_tag: ${{ matrix.version }} version: ${{ matrix.version }} variant: ${{ needs.load_vars.outputs.VARIANT }} + 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 }} diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml index a5297e6..0a420ea 100644 --- a/.github/workflows/test_deployment.yml +++ b/.github/workflows/test_deployment.yml @@ -9,6 +9,9 @@ on: parent_job_name: required: true type: string + flatpaks_refs: + required: false + type: string flatpaks_refs_dir: required: false type: string @@ -110,7 +113,8 @@ jobs: IMAGE_TAG=${{ matrix.version }} \ VERSION=${{ matrix.version }} \ VARIANT=${{ needs.load_vars.outputs.VARIANT }} \ - FLATPAK_REMOTE_REFS_DIR=${{ inputs.flatpaks_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 diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml index 6b3bd69..c4f0bec 100644 --- a/.github/workflows/test_iso.yml +++ b/.github/workflows/test_iso.yml @@ -9,6 +9,9 @@ on: parent_job_name: required: true type: string + flatpaks_refs: + required: false + type: string flatpaks_refs_dir: required: false type: string @@ -91,7 +94,8 @@ jobs: IMAGE_TAG=${{ matrix.version }} \ VERSION=${{ matrix.version }} \ VARIANT=${{ needs.load_vars.outputs.VARIANT }} \ - FLATPAK_REMOTE_REFS_DIR=${{ inputs.flatpaks_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 }} \ ISO_NAME=${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bdb439d..9021049 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -64,6 +64,39 @@ jobs: 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 + + 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 + + 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 + build_iso: name: Build ISO needs: diff --git a/Makefile.inputs b/Makefile.inputs index c425bea..ad4f333 100644 --- a/Makefile.inputs +++ b/Makefile.inputs @@ -1,24 +1,24 @@ # Configuration vars ## Formatting = UPPERCASE # General -export ADDITIONAL_TEMPLATES = -export ARCH = x86_64 -export EXTRA_BOOT_PARAMS = -export IMAGE_NAME = base -export IMAGE_REPO = quay.io/fedora-ostree-desktops -export IMAGE_TAG = $(VERSION) - REPOS = $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo)) -export ROOTFS_SIZE = 4 -export VARIANT = Server -export VERSION = 39 -export WEB_UI = false +export ADDITIONAL_TEMPLATES := +export ARCH := x86_64 +export EXTRA_BOOT_PARAMS := +export IMAGE_NAME := base +export IMAGE_REPO := quay.io/fedora-ostree-desktops +export IMAGE_TAG = $(VERSION) + REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo)) +export ROOTFS_SIZE := 4 +export VARIANT := Server +export VERSION := 39 +export WEB_UI := false # Flatpak -export FLATPAK_REMOTE_NAME = flathub -export FLATPAK_REMOTE_URL = https://flathub.org/repo/flathub.flatpakrepo -export FLATPAK_REMOTE_REFS = -export FLATPAK_REMOTE_REFS_DIR = -export FLATPAK_DIR = +export FLATPAK_REMOTE_NAME := flathub +export FLATPAK_REMOTE_URL := https://flathub.org/repo/flathub.flatpakrepo +export FLATPAK_REMOTE_REFS := +export FLATPAK_REMOTE_REFS_DIR := +export FLATPAK_DIR := # Secure boot -export ENROLLMENT_PASSWORD = -export SECURE_BOOT_KEY_URL = -export ISO_NAME = build/deploy.iso \ No newline at end of file +export ENROLLMENT_PASSWORD := +export SECURE_BOOT_KEY_URL := +export ISO_NAME := build/deploy.iso \ No newline at end of file