Commit 741b6b63 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

template-ci: rework around 'needs'



- we can put part of it in .ci-commons-{{distribution}}
- ensure qemu-check is not run if bootstrap-qemu-mkosi failed
Signed-off-by: Benjamin Tissoires's avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
parent 94c8c169
......@@ -15,6 +15,9 @@
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '.hidden_dir/test.sh /test_file'
needs:
- bootstrap
- sanity check
#
# A few templates to avoid writing the image and stage in each job
......@@ -25,9 +28,6 @@
- .ci-commons-alpine
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: alpine_container_build
needs:
- bootstrap
- sanity check
.alpine:ci@container-ifnot-exists:
......@@ -36,9 +36,6 @@
- .ci-commons-alpine
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: alpine_container_build
needs:
- bootstrap
- sanity check
.alpine:ci@container-build@arm64v8:
......
......@@ -15,6 +15,9 @@
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '/bin/bash test/script.sh'
needs:
- bootstrap
- sanity check
#
# A few templates to avoid writing the image and stage in each job
......@@ -25,9 +28,6 @@
- .ci-commons-arch
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: arch_container_build
needs:
- bootstrap
- sanity check
.arch:ci@container-ifnot-exists:
......@@ -36,9 +36,6 @@
- .ci-commons-arch
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: arch_container_build
needs:
- bootstrap
- sanity check
#
......
......@@ -15,6 +15,9 @@
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: './test/script.sh'
needs:
- bootstrap
- sanity check
#
# A few templates to avoid writing the image and stage in each job
......@@ -25,9 +28,6 @@
- .ci-commons-centos
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: centos_container_build
needs:
- bootstrap
- sanity check
.centos:ci@container-ifnot-exists:
......@@ -36,9 +36,6 @@
- .ci-commons-centos
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: centos_container_build
needs:
- bootstrap
- sanity check
#
......
......@@ -15,6 +15,9 @@
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
needs:
- bootstrap
- sanity check
#
# A few templates to avoid writing the image and stage in each job
......@@ -25,9 +28,6 @@
- .ci-commons-debian
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: debian_container_build
needs:
- bootstrap
- sanity check
.debian:ci@container-ifnot-exists:
......@@ -36,9 +36,6 @@
- .ci-commons-debian
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: debian_container_build
needs:
- bootstrap
- sanity check
.debian:ci@container-build@arm64v8:
......@@ -238,6 +235,7 @@ debian:stretch@qemu-check:
extends: .debian@qemu-check
image: $CI_REGISTRY_IMAGE/debian/stretch:fdo-ci-qemu-$CI_PIPELINE_ID
needs:
- bootstrap-qemu-mkosi
- debian:stretch@qemu-build
- sanity check
......
......@@ -15,6 +15,9 @@
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '.hidden_dir/test.sh /test_file'
needs:
- bootstrap
- sanity check
#
# A few templates to avoid writing the image and stage in each job
......@@ -25,9 +28,6 @@
- .ci-commons-fedora
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: fedora_container_build
needs:
- bootstrap
- sanity check
.fedora:ci@container-ifnot-exists:
......@@ -36,9 +36,6 @@
- .ci-commons-fedora
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: fedora_container_build
needs:
- bootstrap
- sanity check
.fedora:ci@container-build@arm64v8:
......@@ -238,6 +235,7 @@ fedora:31@qemu-check:
extends: .fedora@qemu-check
image: $CI_REGISTRY_IMAGE/fedora/31:fdo-ci-qemu-$CI_PIPELINE_ID
needs:
- bootstrap-qemu-mkosi
- fedora:31@qemu-build
- sanity check
......
......@@ -15,6 +15,9 @@
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '{{ script }}'
needs:
- bootstrap
- sanity check
#
# A few templates to avoid writing the image and stage in each job
......@@ -25,9 +28,6 @@
- .ci-commons-{{distribution}}
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: {{distribution}}_container_build
needs:
- bootstrap
- sanity check
.{{distribution}}:ci@container-ifnot-exists:
......@@ -36,9 +36,6 @@
- .ci-commons-{{distribution}}
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: {{distribution}}_container_build
needs:
- bootstrap
- sanity check
{% if aarch64 %}
......@@ -257,6 +254,7 @@
extends: .{{distribution}}@qemu-check
image: $CI_REGISTRY_IMAGE/{{distribution}}/{{ versions[0] }}:fdo-ci-qemu-$CI_PIPELINE_ID
needs:
- bootstrap-qemu-mkosi
- {{distribution}}:{{ versions[0] }}@qemu-build
- sanity check
{% endif %}
......
......@@ -15,6 +15,9 @@
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '/bin/bash test/script.sh'
needs:
- bootstrap
- sanity check
#
# A few templates to avoid writing the image and stage in each job
......@@ -25,9 +28,6 @@
- .ci-commons-ubuntu
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: ubuntu_container_build
needs:
- bootstrap
- sanity check
.ubuntu:ci@container-ifnot-exists:
......@@ -36,9 +36,6 @@
- .ci-commons-ubuntu
image: $CI_REGISTRY_IMAGE/buildah:$BOOTSTRAP_TAG
stage: ubuntu_container_build
needs:
- bootstrap
- sanity check
.ubuntu:ci@container-build@arm64v8:
......@@ -238,6 +235,7 @@ ubuntu:19.10@qemu-check:
extends: .ubuntu@qemu-check
image: $CI_REGISTRY_IMAGE/ubuntu/19.10:fdo-ci-qemu-$CI_PIPELINE_ID
needs:
- bootstrap-qemu-mkosi
- ubuntu:19.10@qemu-build
- sanity check
......
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