ci: Switch to builder image

This avoids doing packaging before we do packaging, and paves
the way for doing basic qemu testing.
This commit is contained in:
Colin Walters 2023-09-18 18:16:20 -04:00
parent 901c1fd704
commit 5d6149ffb9
1 changed files with 2 additions and 7 deletions

View File

@ -1,6 +1,5 @@
# Yes, we're using FCOS as a buildroot
image: quay.io/fedora/fedora-coreos:stable
image: registry.gitlab.com/cgwalters-playground/sagano-builder/builder-centos:stream9
stages:
- build
@ -26,9 +25,6 @@ test-build:
only:
- merge_requests
stage: build
before_script:
# Log into the registry
- echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script:
- rpm-ostree install distribution-gpg-keys
- set -euo pipefail; rpm-ostree compose image --format=ociarchive --initialize ${OS}-${TIER}${VARIANT}-${VERSION}.yaml dest.oci-archive
@ -43,8 +39,7 @@ build-push:
stage: build
before_script:
# Log into the registry
- echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
- echo "$CI_REGISTRY_PASSWORD" | skopeo login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script:
- rpm-ostree install distribution-gpg-keys
- set -euo pipefail; rpm-ostree compose image ${COMPOSE_INITIALIZE:+--initialize} ${FORCE:+--force-nocache} --format=registry ${OS}-${TIER}${VARIANT}-${VERSION}.yaml ${CI_REGISTRY_IMAGE}/${OS}-boot-${TIER}${VARIANT}:${VERSION}