Skip to content
Snippets Groups Projects
Commit c7faa400 authored by Walter Lozano's avatar Walter Lozano
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 d285422a.

Signed-off-by: default avatarWalter Lozano <walter.lozano@collabora.com>
parent fb4c138c
No related branches found
No related tags found
1 merge request!280Use Debian bookworm as base
Pipeline #492243 failed
...@@ -161,87 +161,6 @@ test-package-source-builder: ...@@ -161,87 +161,6 @@ test-package-source-builder:
- test "$(dpkg-parsechangelog -SDistribution)" = UNRELEASED - test "$(dpkg-parsechangelog -SDistribution)" = UNRELEASED
- cd .. - cd ..
build-documentation-builder-docker-image:
extends: .build-docker-image
stage: derived images
variables:
image: documentation-builder
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-shared-runner-uml:
extends: test-image-builder-shared-runner-default
variables:
DEBOS_ARGS: --fakemachine-backend=uml -t required_backend:uml
before_script:
- ": Test that UML is still available for backward-compatibility"
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: publish-base-docker-image:
extends: .publish-docker-image extends: .publish-docker-image
stage: publish images stage: publish images
...@@ -253,39 +172,3 @@ publish-package-source-builder-docker-image: ...@@ -253,39 +172,3 @@ publish-package-source-builder-docker-image:
stage: publish images stage: publish images
variables: variables:
image: package-source-builder image: package-source-builder
publish-documentation-builder-docker-image:
extends: .publish-docker-image
stage: publish images
variables:
image: documentation-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 ...@@ -30,4 +30,4 @@ ARG OSPACK=rootfs.tar.gz
ADD ${OSPACK} / ADD ${OSPACK} /
# Always install procps in case the docker file gets used in jenkins # 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: ...@@ -12,7 +12,7 @@ actions:
- action: debootstrap - action: debootstrap
suite: {{ $suite }} suite: {{ $suite }}
components: components:
- target - main
mirror: {{ $mirror }} mirror: {{ $mirror }}
variant: minbase variant: minbase
keyring-package: {{ $osname }}-archive-keyring keyring-package: {{ $osname }}-archive-keyring
......
...@@ -68,11 +68,6 @@ RUN apt-get update && \ ...@@ -68,11 +68,6 @@ RUN apt-get update && \
RUN apt-get update && \ RUN apt-get update && \
apt-get install --no-install-recommends -y libnss-unknown apt-get install --no-install-recommends -y libnss-unknown
# Install the LAVA submission tool
RUN git clone https://gitlab.apertis.org/infrastructure/lava-phab-bridge /tmp/lava-phab-bridge && \
install -m755 /tmp/lava-phab-bridge/lava-submit.py /usr/bin/lava-submit && \
rm -rf /tmp/lava-phab-bridge
# Allow to connect to unknown hosts for non-interactive ssh # Allow to connect to unknown hosts for non-interactive ssh
# NB: possible security issue # NB: possible security issue
RUN echo " StrictHostKeyChecking no" >> /etc/ssh/ssh_config RUN echo " StrictHostKeyChecking no" >> /etc/ssh/ssh_config
File added
...@@ -25,9 +25,9 @@ actions: ...@@ -25,9 +25,9 @@ actions:
- action: debootstrap - action: debootstrap
suite: {{ $suite }} suite: {{ $suite }}
components: components:
- target - main
mirror: {{ $mirror }} mirror: {{ $mirror }}
variant: minbase variant: minbase
keyring-package: {{ $osname }}-archive-keyring keyring-package: debian-archive-keyring
keyring-file: keyring/{{ $osname }}-archive-keyring.gpg keyring-file: keyring/debian-archive-keyring.gpg
merged-usr: true merged-usr: true
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