[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/10] gitlab-ci: Extract core container jobs to container-cor
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 09/10] gitlab-ci: Extract core container jobs to container-core.yml |
Date: |
Wed, 19 May 2021 20:55:03 +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.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitlab-ci.d/container-core.yml | 17 +++++++++++++++++
.gitlab-ci.d/containers.yml | 17 +----------------
2 files changed, 18 insertions(+), 16 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..2c1380158f8 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -1,5 +1,5 @@
include:
- - local: '/.gitlab-ci.d/container-template.yml'
+ - local: '/.gitlab-ci.d/container-core.yml'
amd64-alpine-container:
extends: .container_job_template
@@ -11,16 +11,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 +180,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
- [PATCH v3 01/10] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job), (continued)
- [PATCH v3 01/10] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job), Philippe Mathieu-Daudé, 2021/05/19
- [PATCH v3 02/10] gitlab-ci: Rename acceptance_test_job -> integration_test_job, Philippe Mathieu-Daudé, 2021/05/19
- [PATCH v3 03/10] gitlab-ci: Extract container job template to container-template.yml, Philippe Mathieu-Daudé, 2021/05/19
- [PATCH v3 04/10] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml, Philippe Mathieu-Daudé, 2021/05/19
- [PATCH v3 05/10] gitlab-ci: Extract DCO/style check jobs to static_checks.yml, Philippe Mathieu-Daudé, 2021/05/19
- [PATCH v3 06/10] gitlab-ci: Extract build stages to stages.yml, Philippe Mathieu-Daudé, 2021/05/19
- [PATCH v3 07/10] gitlab-ci: Extract default build/test jobs templates, Philippe Mathieu-Daudé, 2021/05/19
- [PATCH v3 08/10] gitlab-ci: Extract all default build/test jobs to buildtest.yml, Philippe Mathieu-Daudé, 2021/05/19
- [PATCH v3 09/10] gitlab-ci: Extract core container jobs to container-core.yml,
Philippe Mathieu-Daudé <=
- [PATCH v3 10/10] gitlab-ci: Move current job set to qemu-project.yml, Philippe Mathieu-Daudé, 2021/05/19
- Re: [PATCH v3 00/10] gitlab-ci: Ease forks pipeline workflow, Thomas Huth, 2021/05/20