Skip to content
Snippets Groups Projects
Commit 52418437 authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

Enable only the package-source-builder docker image


For the use case of building pure Debian packages, we only need the
package-source-builder. So, lets just disable the rest of the images.

And also add the Debian specific bits to get the debootstrap work.

This is the same approach done in c7faa400 (Bookworm) and d285422a (Bullseye.)

Signed-off-by: default avatarDylan Aïssi <dylan.aissi@collabora.com>
parent bf74e276
No related branches found
No related tags found
No related merge requests found
......@@ -161,74 +161,6 @@ test-package-source-builder:
- test "$(dpkg-parsechangelog -SDistribution)" = UNRELEASED
- cd ..
build-image-builder-docker-image:
extends: .build-docker-image
stage: derived images
variables:
image: image-builder
build-testcases-builder-docker-image:
extends: .build-docker-image
stage: derived images
variables:
image: testcases-builder
build-flatdeb-builder-docker-image:
extends: .build-docker-image
stage: derived images
variables:
image: flatdeb-builder
build-ostree-receive-image:
extends: .build-docker-image
stage: derived images
variables:
image: ostree-receive
build-toolbox-image:
extends: .build-docker-image
stage: toolbox images
variables:
image: toolbox
test-image-builder-shared-runner-default:
stage: image test
needs:
- build-image-builder-docker-image
image:
name: $CI_REGISTRY_IMAGE/${RELEASE}-image-builder:${TEST_TAG}
entrypoint: [ "" ]
variables:
DEBOS_ARGS: -t required_backend:kvm
before_script:
- ": Test that KVM is being picked up by default"
script:
- debos --verbose --show-boot -t osname:${DISTRO} -t suite:${RELEASE} -t mirror:"${MIRROR}" ${DEBOS_ARGS} image-builder/test-recipe.yaml
test-image-builder-kvm-runner:
extends: test-image-builder-shared-runner-default
tags:
- kvm
variables:
DEBOS_ARGS: -t required_backend:kvm
before_script:
- ": Test that KVM is available on the old KVM runner to be dismissed"
test-flatdeb-builder:
stage: image test
needs:
- build-flatdeb-builder-docker-image
image:
name: $CI_REGISTRY_IMAGE/${RELEASE}-flatdeb-builder:${TEST_TAG}
entrypoint: [ "" ]
script:
- cd flatdeb-builder/
- cat suites/default.yaml.tpl | sed
-e "s|%MIRROR%|${MIRROR}|g"
-e "s|%DISTRO%|${DISTRO}|g"
| tee "suites/${RELEASE}.yaml"
- /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=${RELEASE} --arch=amd64 base
publish-base-docker-image:
extends: .publish-docker-image
stage: publish images
......@@ -240,33 +172,3 @@ publish-package-source-builder-docker-image:
stage: publish images
variables:
image: package-source-builder
publish-testcases-builder-docker-image:
extends: .publish-docker-image
stage: publish images
variables:
image: testcases-builder
publish-image-builder-docker-image:
extends: .publish-docker-image
stage: publish images
variables:
image: image-builder
publish-flatdeb-builder-docker-image:
extends: .publish-docker-image
stage: publish images
variables:
image: flatdeb-builder
publish-ostree-receive-docker-image:
extends: .publish-docker-image
stage: publish images
variables:
image: ostree-receive
publish-toolbox-image:
extends: .publish-docker-image
stage: publish images
variables:
image: toolbox
......@@ -30,4 +30,4 @@ ARG OSPACK=rootfs.tar.gz
ADD ${OSPACK} /
# Always install procps in case the docker file gets used in jenkins
RUN apt-get update && apt-get install --no-install-recommends -y procps
RUN apt-get update && apt-get install --no-install-recommends -y procps debian-archive-keyring
File added
......@@ -12,7 +12,7 @@ actions:
- action: debootstrap
suite: {{ $suite }}
components:
- target
- main
mirror: {{ $mirror }}
variant: minbase
keyring-package: {{ $osname }}-archive-keyring
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment