1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 19:07:54 +01:00

add test with refs

This commit is contained in:
Jason N. 2024-04-02 17:27:48 -04:00
parent b95faefea1
commit 4ed0636e03
5 changed files with 66 additions and 21 deletions

View file

@ -9,6 +9,9 @@ on:
parent_job_name: parent_job_name:
required: true required: true
type: string type: string
flatpaks_refs:
required: false
type: string
flatpaks_refs_dir: flatpaks_refs_dir:
required: false required: false
type: string type: string
@ -116,6 +119,7 @@ jobs:
image_tag: ${{ matrix.version }} image_tag: ${{ matrix.version }}
version: ${{ matrix.version }} version: ${{ matrix.version }}
variant: ${{ needs.load_vars.outputs.VARIANT }} variant: ${{ needs.load_vars.outputs.VARIANT }}
flatpak_remote_refs: ${{ inputs.flatpaks_refs }}
flatpak_remote_refs_dir: ${{ inputs.flatpaks_refs_dir }} flatpak_remote_refs_dir: ${{ inputs.flatpaks_refs_dir }}
secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} 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 }}

View file

@ -9,6 +9,9 @@ on:
parent_job_name: parent_job_name:
required: true required: true
type: string type: string
flatpaks_refs:
required: false
type: string
flatpaks_refs_dir: flatpaks_refs_dir:
required: false required: false
type: string type: string
@ -110,7 +113,8 @@ jobs:
IMAGE_TAG=${{ matrix.version }} \ IMAGE_TAG=${{ matrix.version }} \
VERSION=${{ matrix.version }} \ VERSION=${{ matrix.version }} \
VARIANT=${{ needs.load_vars.outputs.VARIANT }} \ 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 }} \ 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 }}
kill $QEMU_PID kill $QEMU_PID

View file

@ -9,6 +9,9 @@ on:
parent_job_name: parent_job_name:
required: true required: true
type: string type: string
flatpaks_refs:
required: false
type: string
flatpaks_refs_dir: flatpaks_refs_dir:
required: false required: false
type: string type: string
@ -91,7 +94,8 @@ jobs:
IMAGE_TAG=${{ matrix.version }} \ IMAGE_TAG=${{ matrix.version }} \
VERSION=${{ matrix.version }} \ VERSION=${{ matrix.version }} \
VARIANT=${{ needs.load_vars.outputs.VARIANT }} \ 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 }} \ 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 ISO_NAME=${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso

View file

@ -64,6 +64,39 @@ jobs:
flatpaks_refs_dir: flatpak_refs flatpaks_refs_dir: flatpak_refs
suffix: flatpaks 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: build_iso:
name: Build ISO name: Build ISO
needs: needs:

View file

@ -1,24 +1,24 @@
# Configuration vars # Configuration vars
## Formatting = UPPERCASE ## Formatting = UPPERCASE
# General # General
export ADDITIONAL_TEMPLATES = export ADDITIONAL_TEMPLATES :=
export ARCH = x86_64 export ARCH := x86_64
export EXTRA_BOOT_PARAMS = export EXTRA_BOOT_PARAMS :=
export IMAGE_NAME = base export IMAGE_NAME := base
export IMAGE_REPO = quay.io/fedora-ostree-desktops export IMAGE_REPO := quay.io/fedora-ostree-desktops
export IMAGE_TAG = $(VERSION) export IMAGE_TAG = $(VERSION)
REPOS = $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo)) REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo))
export ROOTFS_SIZE = 4 export ROOTFS_SIZE := 4
export VARIANT = Server export VARIANT := Server
export VERSION = 39 export VERSION := 39
export WEB_UI = false export WEB_UI := false
# Flatpak # Flatpak
export FLATPAK_REMOTE_NAME = flathub export FLATPAK_REMOTE_NAME := flathub
export FLATPAK_REMOTE_URL = https://flathub.org/repo/flathub.flatpakrepo export FLATPAK_REMOTE_URL := https://flathub.org/repo/flathub.flatpakrepo
export FLATPAK_REMOTE_REFS = export FLATPAK_REMOTE_REFS :=
export FLATPAK_REMOTE_REFS_DIR = export FLATPAK_REMOTE_REFS_DIR :=
export FLATPAK_DIR = export FLATPAK_DIR :=
# Secure boot # Secure boot
export ENROLLMENT_PASSWORD = export ENROLLMENT_PASSWORD :=
export SECURE_BOOT_KEY_URL = export SECURE_BOOT_KEY_URL :=
export ISO_NAME = build/deploy.iso export ISO_NAME := build/deploy.iso