Commit 8b34f1e9 authored by Thibault Saunier's avatar Thibault Saunier 🌵

Also run the main CI template in .gitlab-ci.yml

Rename some job otherwise some names where too similare.
parent 6ddb35c3
......@@ -2,8 +2,12 @@ stages:
- test
- "build runtime"
- "build base"
- "manifest"
- "build"
test manifest:
variables:
GIT_STRATEGY: fetch
image: "fedora"
stage: "test"
before_script:
......@@ -24,6 +28,7 @@ test manifest:
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
DOCKER_DRIVER: "overlay2"
GIT_STRATEGY: fetch
script:
- export IMAGE="${CI_REGISTRY_IMAGE}/${ARCH}/${TAG}"
- export REF="${IMAGE}:${CI_COMMIT_SHA}"
......@@ -46,7 +51,7 @@ test manifest:
- "docker/*/**"
fedora amd64 run:
fedora amd64 run docker:
stage: "build runtime"
variables:
ARCH: "amd64"
......@@ -55,7 +60,7 @@ fedora amd64 run:
DOCKERFILE: "docker/runtime-images/Dockerfile-fedora"
extends: .base
fedora amd64 build:
fedora amd64 build docker:
stage: "build base"
variables:
ARCH: "amd64"
......@@ -64,3 +69,4 @@ fedora amd64 build:
DOCKERFILE: "docker/build-base-images/Dockerfile-fedora"
extends: .base
include: "gitlab/ci_template.yml"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment