gitlab-ci: Inline the test jobs

With the current tagging scheme dynamic child pipelines are not needed
for the test jobs, let's inline the job in the main pipeline.

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

.gitlab-ci.yml

@@ -59,7 +59,7 @@ build-base-rootfs:
     - branches
   needs:
      - build-base-rootfs
-  script: &build-docker-image-script
+  script:
     - mkdir /kaniko/.docker/
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - >
@@ -116,19 +116,8 @@ build-documentation-builder-docker-image:
 build-image-builder-docker-image:
   extends: .build-docker-image
   stage: derived images
-  needs:
-     - build-base-docker-image
   variables:
     image: image-builder
-  script:
-    - *build-docker-image-script
-    - env
-    - cat apertis-image-builder/image-builder-gitlab-ci.yml
-        | sed -e s,%RELEASE%,${RELEASE}, -e s,%TAG%,${TEST_TAG},
-        > image-builder-gitlab-ci.yml
-  artifacts:
-    paths:
-      - image-builder-gitlab-ci.yml
 
 build-testcases-builder-docker-image:
   extends: .build-docker-image
@@ -139,39 +128,29 @@ build-testcases-builder-docker-image:
 build-flatdeb-builder-docker-image:
   extends: .build-docker-image
   stage: derived images
-  needs:
-     - build-base-docker-image
   variables:
     image: flatdeb-builder
-  script:
-    - *build-docker-image-script
-    - env
-    - cat apertis-flatdeb-builder/flatdeb-builder-gitlab-ci.yml
-        | sed -e s,%RELEASE%,${RELEASE}, -e s,%TAG%,${TEST_TAG},
-        > flatdeb-builder-gitlab-ci.yml
-  artifacts:
-    paths:
-      - flatdeb-builder-gitlab-ci.yml
 
-trigger-image-builder-test:
+test-image-builder:
   stage: image test
   needs:
     - build-image-builder-docker-image
-  trigger:
-    strategy: depend
-    include:
-      - artifact: image-builder-gitlab-ci.yml
-        job: build-image-builder-docker-image
+  image:
+    name: $CI_REGISTRY_IMAGE/${RELEASE}-image-builder:${TEST_TAG}
+    entrypoint: [ "" ]
+  script:
+    - debos -t suite:${RELEASE} apertis-image-builder/test-recipe.yaml
 
-trigger-flatdeb-builder-test:
+test-flatdeb-builder:
   stage: image test
   needs:
     - build-flatdeb-builder-docker-image
-  trigger:
-    strategy: depend
-    include:
-      - artifact: flatdeb-builder-gitlab-ci.yml
-        job: build-flatdeb-builder-docker-image
+  image:
+    name: $CI_REGISTRY_IMAGE/${RELEASE}-flatdeb-builder:${TEST_TAG}
+    entrypoint: [ "" ]
+  script:
+    - cd apertis-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:
   extends: .publish-docker-image
@@ -217,7 +196,7 @@ publish-image-builder-docker-image:
   extends: .publish-docker-image
   stage: publish images
   needs:
-     - trigger-image-builder-test
+     - test-image-builder
   variables:
     image: image-builder
 
@@ -225,6 +204,6 @@ publish-flatdeb-builder-docker-image:
   extends: .publish-docker-image
   stage: publish images
   needs:
-     - trigger-flatdeb-builder-test
+     - test-flatdeb-builder
   variables:
     image: flatdeb-builder

apertis-flatdeb-builder/flatdeb-builder-gitlab-ci.yml

-stages:
-  - test
-
-test-flatdeb-builder:
-  stage: test
-  image:
-    name: $CI_REGISTRY_IMAGE/%RELEASE%-flatdeb-builder:%TAG%
-    entrypoint: [ "" ]
-  script:
-    - cd apertis-flatdeb-builder/
-    - /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=%RELEASE% --arch=amd64 base

apertis-image-builder/image-builder-gitlab-ci.yml

-stages:
-  - test
-
-test-image-builder:
-  stage: test
-  image:
-    name: $CI_REGISTRY_IMAGE/%RELEASE%-image-builder:%TAG%
-    entrypoint: [ "" ]
-  script:
-    - debos -t suite:%RELEASE% apertis-image-builder/test-recipe.yaml