Skip to content

Commit

Permalink
gitlab: Extract core container jobs to container-core.yml
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
philmd committed May 27, 2021
1 parent 6cd5251 commit 6b505a4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
17 changes: 17 additions & 0 deletions .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
17 changes: 1 addition & 16 deletions .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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 6b505a4

Please sign in to comment.