Drop the apertis- prefix from the image folders

Repeating "apertis" everywhere is not particularly useful but is
annoying for downstreams which have to either keep the misleading
names or rename everything and deal with the resulting mess when
pulling updates.

This also makes our life less painful since not having a common prefix
makes shell completion much more useful. :)

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

.gitlab-ci.yml

@@ -42,13 +42,13 @@ build-base-rootfs:
     - kvm
   artifacts:
     paths:
-      - '*-base/*.tar.gz'
+      - base/*.tar.gz
     expire_in: 1d
   only:
     - branches
   script:
     - >
-      cd $DISTRO-base &&
+      cd base &&
       debos -t suite:$RELEASE -t stable:$STABLE $DISTRO.yaml
 
 .build-docker-image:
@@ -62,8 +62,8 @@ build-base-rootfs:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - >
       /kaniko/executor
-      --context $CI_PROJECT_DIR/$DISTRO-$image
-      --dockerfile $CI_PROJECT_DIR/$DISTRO-$image/Dockerfile
+      --context $CI_PROJECT_DIR/$image
+      --dockerfile $CI_PROJECT_DIR/$image/Dockerfile
       --destination $CI_REGISTRY_IMAGE/$RELEASE-$image:$TEST_TAG
       --build-arg RELEASE=$RELEASE
       --build-arg TAG=$TEST_TAG
@@ -140,7 +140,7 @@ test-image-builder:
     name: $CI_REGISTRY_IMAGE/${RELEASE}-image-builder:${TEST_TAG}
     entrypoint: [ "" ]
   script:
-    - debos -t suite:${RELEASE} apertis-image-builder/test-recipe.yaml
+    - debos -t suite:${RELEASE} image-builder/test-recipe.yaml
 
 test-flatdeb-builder:
   stage: image test
@@ -150,7 +150,7 @@ test-flatdeb-builder:
     name: $CI_REGISTRY_IMAGE/${RELEASE}-flatdeb-builder:${TEST_TAG}
     entrypoint: [ "" ]
   script:
-    - cd apertis-flatdeb-builder/
+    - cd flatdeb-builder/
     - /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: