Commit 37c1308c authored by Peter Hutterer's avatar Peter Hutterer
Browse files

Use the local buildah image for the ci-fairy base image



Where this job is run in a user fork and the bootstrap tag is updated, the
image does not exist on quay.io when we get to this part of the pipeline.

Fix this by using the image from the local pipeline instead.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent ef930450
Pipeline #245227 passed with stages
in 3 minutes and 23 seconds
......@@ -5,12 +5,16 @@ stages:
- base image build
- image build
.local buildah image:
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
# The ci-fairy base image. We build a base image that we can bump independently
# via the tag, ci-fairy itself gets layered on top with each commit.
# This image is private to ci-templates.
ci-fairy-base-image:
extends:
- .fdo.container-build@alpine@x86_64
- .local buildah image
stage: base image build
variables:
FDO_DISTRIBUTION_PACKAGES: 'git python3 py-pip bash'
......@@ -27,6 +31,7 @@ ci-fairy-image:
extends:
- .ci-fairy-tag
- .fdo.container-build@alpine@x86_64
- .local buildah image
stage: image build
variables:
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/ci-fairy:ci-fairy-base-image-2020-11-03
......
......@@ -5,12 +5,16 @@ stages:
- base image build
- image build
.local buildah image:
image: $CI_REGISTRY_IMAGE/x86_64/buildah:{{bootstrap_tag}}
# The ci-fairy base image. We build a base image that we can bump independently
# via the tag, ci-fairy itself gets layered on top with each commit.
# This image is private to ci-templates.
ci-fairy-base-image:
extends:
- .fdo.container-build@{{base_distro}}@x86_64
- .local buildah image
stage: base image build
variables:
FDO_DISTRIBUTION_PACKAGES: '{{packages}}'
......@@ -27,6 +31,7 @@ ci-fairy-image:
extends:
- .ci-fairy-tag
- .fdo.container-build@{{base_distro}}@x86_64
- .local buildah image
stage: image build
variables:
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/ci-fairy:{{tag}}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment