[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/15] gitlab-ci: Extract core container jobs to container-core.y
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 11/15] gitlab-ci: Extract core container jobs to container-core.yml |
Date: |
Mon, 19 Apr 2021 01:34:44 +0200 |
It is not possible to use the previously extracted templates
without this set of core containers. Extract them into a new
file (container-core.yml) to be able to build them without
having to build all the other containers by default.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitlab-ci.d/container-core.yml | 17 +++++++++++++++++
.gitlab-ci.d/containers.yml | 16 +---------------
2 files changed, 18 insertions(+), 15 deletions(-)
create mode 100644 .gitlab-ci.d/container-core.yml
diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.yml
new file mode 100644
index 00000000000..e8dd1f476a2
--- /dev/null
+++ b/.gitlab-ci.d/container-core.yml
@@ -0,0 +1,17 @@
+include:
+ - local: '/.gitlab-ci.d/container-template.yml'
+
+amd64-centos8-container:
+ extends: .container_job_template
+ variables:
+ NAME: centos8
+
+amd64-fedora-container:
+ extends: .container_job_template
+ variables:
+ NAME: fedora
+
+amd64-debian10-container:
+ extends: .container_job_template
+ variables:
+ NAME: debian10
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 0bf4899df10..c371f8587e1 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -1,5 +1,6 @@
include:
- local: '/.gitlab-ci.d/container-template.yml'
+ - local: '/.gitlab-ci.d/container-core.yml'
amd64-alpine-container:
extends: .container_job_template
@@ -11,16 +12,6 @@ amd64-centos7-container:
variables:
NAME: centos7
-amd64-centos8-container:
- extends: .container_job_template
- variables:
- NAME: centos8
-
-amd64-debian10-container:
- extends: .container_job_template
- variables:
- NAME: debian10
-
amd64-debian11-container:
extends: .container_job_template
variables:
@@ -190,11 +181,6 @@ cris-fedora-cross-container:
variables:
NAME: fedora-cris-cross
-amd64-fedora-container:
- extends: .container_job_template
- variables:
- NAME: fedora
-
i386-fedora-cross-container:
extends: .container_job_template
variables:
--
2.26.3
- Re: [PATCH 05/15] gitlab-ci: Rename acceptance_test_job -> integration_test_job, (continued)
- [PATCH 06/15] gitlab-ci: Extract container job template to container-template.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 07/15] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 08/15] gitlab-ci: Extract DCO/style check jobs to checks.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 09/15] gitlab-ci: Extract build stages to stages.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 10/15] gitlab-ci: Extract all default build/test jobs to buildtest.yml, Philippe Mathieu-Daudé, 2021/04/18
- [PATCH 11/15] gitlab-ci: Extract core container jobs to container-core.yml,
Philippe Mathieu-Daudé <=
- [PATCH 12/15] gitlab-ci: Move current job set to qemu-project.yml, Philippe Mathieu-Daudé, 2021/04/18
- [RFC PATCH 13/15] gitlab-ci: Switch to dynamically generated pipelines, Philippe Mathieu-Daudé, 2021/04/18
- [RFC PATCH 14/15] gitlab-ci: Allow forks to use different set of jobs, Philippe Mathieu-Daudé, 2021/04/18