From 5d6149ffb9e6e4fb168abdc6f8299d0f10740e90 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 18 Sep 2023 18:16:20 -0400
Subject: [PATCH] ci: Switch to builder image

This avoids doing packaging before we do packaging, and paves
the way for doing basic qemu testing.
---
 .gitlab-ci.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3a2619..c1ad47c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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}