[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/19] gitlab: Extract core container jobs to container-core.yml
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 09/19] gitlab: Extract core container jobs to container-core.yml |
Date: |
Wed, 26 May 2021 23:18:28 +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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-10-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.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 2b06763d73b..0acc8381ac1 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:
@@ -211,11 +201,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
- [PULL 00/19] gitlab-ci patches for 2021-05-26, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 01/19] gitlab: Replace YAML anchors by extends (acceptance_test_job), Philippe Mathieu-Daudé, 2021/05/26
- [PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 03/19] gitlab: Enable cross-i386 builds of TCI, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 04/19] gitlab: Extract container job template to container-template.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 05/19] gitlab: Extract crossbuild job templates to crossbuild-template.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 06/19] gitlab: Extract DCO/style check jobs to static_checks.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 07/19] gitlab: Extract build stages to stages.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 08/19] gitlab: Extract default build/test jobs templates, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 09/19] gitlab: Extract core container jobs to container-core.yml,
Philippe Mathieu-Daudé <=
- [PULL 10/19] gitlab: Drop linux user build job for CentOS 7, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 11/19] gitlab: Extract all default build/test jobs to buildtest.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 12/19] gitlab: Move current job set to qemu-project.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 13/19] gitlab: Document how forks can use different set of jobs, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 14/19] gitlab: Extract cross-container jobs to container-cross.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 15/19] gitlab: Keep Avocado reports during 1 week, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 16/19] gitlab: Run Avocado tests manually (except mainstream CI), Philippe Mathieu-Daudé, 2021/05/26
- [PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master', Philippe Mathieu-Daudé, 2021/05/26
- [PULL 18/19] gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 19/19] gitlab: Split gprof-gcov job, Philippe Mathieu-Daudé, 2021/05/26