aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2021-05-19 20:55:00 +0200
committerPhilippe Mathieu-Daudé <f4bug@amsat.org>2021-05-27 16:39:23 +0200
commit07df3dfafa94460082f704dab674a7911c844ba6 (patch)
treec889c2ae3dcbe28f1ec79c6cb58c97a6504536b3
parentf659e6584a2022473af14ac4d89f656515c25ea4 (diff)
gitlab: Extract build stages to stages.yml
Extract the build stages used by our job templates to a new file (stages.yml) to be able to include it with the other templates, without having to run all the jobs included in the default .gitlab-ci.yml, which are mainly useful for mainstream CI. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Willian Rampazzo <willianr@redhat.com> Message-Id: <20210519185504.2198573-7-f4bug@amsat.org> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--.gitlab-ci.d/stages.yml8
-rw-r--r--.gitlab-ci.yml10
2 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab-ci.d/stages.yml b/.gitlab-ci.d/stages.yml
new file mode 100644
index 0000000000..f50826018d
--- /dev/null
+++ b/.gitlab-ci.d/stages.yml
@@ -0,0 +1,8 @@
+# Currently we have two build stages after our containers are built:
+# - build (for traditional build and test or first stage build)
+# - test (for test stages, using build artefacts from a build stage)
+stages:
+ - containers
+ - containers-layer2
+ - build
+ - test
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 369963a949..2be8097f19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,5 @@
-# Currently we have two build stages after our containers are built:
-# - build (for traditional build and test or first stage build)
-# - test (for test stages, using build artefacts from a build stage)
-stages:
- - containers
- - containers-layer2
- - build
- - test
-
include:
+ - local: '/.gitlab-ci.d/stages.yml'
- local: '/.gitlab-ci.d/edk2.yml'
- local: '/.gitlab-ci.d/opensbi.yml'
- local: '/.gitlab-ci.d/containers.yml'