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

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>

.gitlab-ci.yml

@@ -107,12 +107,6 @@ build-base-docker-image:
   variables:
     image: base
 
-build-package-builder-docker-image:
-  extends: .build-docker-image
-  stage: derived images
-  variables:
-    image: package-builder
-
 build-package-source-builder-docker-image:
   extends: .build-docker-image
   stage: derived images
@@ -166,100 +160,14 @@ test-package-source-builder:
     - test "$(dpkg-parsechangelog -SDistribution)" = UNRELEASED
     - 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
-
-test-image-builder-shared-runner:
-  stage: image test
-  needs:
-    - build-image-builder-docker-image
-  image:
-    name: $CI_REGISTRY_IMAGE/${RELEASE}-image-builder:${TEST_TAG}
-    entrypoint: [ "" ]
-  script:
-    - debos --verbose --show-boot -t osname:${DISTRO} -t suite:${RELEASE} -t mirror:"${MIRROR}" -t required_backend:uml image-builder/test-recipe.yaml
-
-test-image-builder-kvm-runner:
-  extends: test-image-builder-shared-runner
-  tags:
-    - kvm
-  script:
-    - debos --verbose --show-boot -t osname:${DISTRO} -t suite:${RELEASE} -t mirror:"${MIRROR}" -t required_backend:kvm image-builder/test-recipe.yaml
-
-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
   variables:
     image: base
 
-publish-package-builder-docker-image:
-  extends: .publish-docker-image
-  stage: publish images
-  variables:
-    image: package-builder
-
 publish-package-source-builder-docker-image:
   extends: .publish-docker-image
   stage: publish images
   variables:
     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

base/Dockerfile

@@ -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

base/rootfs.yaml

@@ -12,7 +12,7 @@ actions:
   - action: debootstrap
     suite: {{ $suite }}
     components:
-      - target
+      - main
     mirror: {{ $mirror }}
     variant: minbase
     keyring-package: {{ $osname }}-archive-keyring

image-builder/Dockerfile

@@ -65,11 +65,6 @@ RUN apt-get update && \
 RUN apt-get update  && \
     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
 # NB: possible security issue
 RUN echo "    StrictHostKeyChecking no" >> /etc/ssh/ssh_config

image-builder/test-recipe.yaml

@@ -25,9 +25,9 @@ actions:
   - action: debootstrap
     suite: {{ $suite }}
     components:
-      - target
+      - main
     mirror: {{ $mirror }}
     variant: minbase
-    keyring-package: apertis-archive-keyring
-    keyring-file: keyring/apertis-archive-keyring.gpg
+    keyring-package: debian-archive-keyring
+    keyring-file: keyring/debian-archive-keyring.gpg
     merged-usr: true