[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 17/25] gitlab: introduce explicit "container" and "build" stag
From: |
Alex Bennée |
Subject: |
[PATCH v2 17/25] gitlab: introduce explicit "container" and "build" stages |
Date: |
Wed, 24 Jun 2020 15:04:38 +0100 |
From: Daniel P. Berrangé <berrange@redhat.com>
If no stage is listed, jobs get put in an implicit "test" stage.
Some jobs which create container images to be used by later stages
are currently listed as in a "build" stages.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200622153318.751107-2-berrange@redhat.com>
---
.gitlab-ci.d/edk2.yml | 3 ++-
.gitlab-ci.d/opensbi.yml | 3 ++-
.gitlab-ci.yml | 11 +++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml
index 088ba4b43a3..d4e7dfcba65 100644
--- a/.gitlab-ci.d/edk2.yml
+++ b/.gitlab-ci.d/edk2.yml
@@ -1,5 +1,5 @@
docker-edk2:
- stage: build
+ stage: containers
rules: # Only run this job when the Dockerfile is modified
- changes:
- .gitlab-ci-edk2.yml
@@ -24,6 +24,7 @@ docker-edk2:
- docker push $IMAGE_TAG
build-edk2:
+ stage: build
rules: # Only run this job when ...
- changes: # ... roms/edk2/ is modified (submodule updated)
- roms/edk2/*
diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
index dd051c01245..ec1c1f4cab7 100644
--- a/.gitlab-ci.d/opensbi.yml
+++ b/.gitlab-ci.d/opensbi.yml
@@ -1,5 +1,5 @@
docker-opensbi:
- stage: build
+ stage: containers
rules: # Only run this job when the Dockerfile is modified
- changes:
- .gitlab-ci-opensbi.yml
@@ -24,6 +24,7 @@ docker-opensbi:
- docker push $IMAGE_TAG
build-opensbi:
+ stage: build
rules: # Only run this job when ...
- changes: # ... roms/opensbi/ is modified (submodule updated)
- roms/opensbi/*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 349c77aa580..9fdc752ea63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,7 @@
+stages:
+ - containers
+ - build
+
include:
- local: '/.gitlab-ci.d/edk2.yml'
- local: '/.gitlab-ci.d/opensbi.yml'
@@ -17,6 +21,7 @@ include:
- JOBS=$(expr $(nproc) + 1)
build-system1:
+ stage: build
image: ubuntu:19.10
<<: *before_script_apt
script:
@@ -31,6 +36,7 @@ build-system1:
- make -j"$JOBS" check
build-system2:
+ stage: build
image: fedora:latest
<<: *before_script_dnf
script:
@@ -46,6 +52,7 @@ build-system2:
- make -j"$JOBS" check
build-disabled:
+ stage: build
image: fedora:latest
<<: *before_script_dnf
script:
@@ -62,6 +69,7 @@ build-disabled:
- make -j"$JOBS" check-qtest SPEED=slow
build-tcg-disabled:
+ stage: build
image: centos:8
<<: *before_script_dnf
script:
@@ -82,6 +90,7 @@ build-tcg-disabled:
260 261 262 263 264 270 272 273 277 279
build-user:
+ stage: build
<<: *before_script_apt
script:
- mkdir build
@@ -92,6 +101,7 @@ build-user:
- make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user
build-clang:
+ stage: build
image: fedora:latest
<<: *before_script_dnf
script:
@@ -106,6 +116,7 @@ build-clang:
- make -j"$JOBS" check
build-tci:
+ stage: build
image: centos:8
<<: *before_script_dnf
script:
--
2.20.1
- [PATCH v2 16/25] .gitignore: un-ignore .gitlab-ci.d, (continued)
- [PATCH v2 16/25] .gitignore: un-ignore .gitlab-ci.d, Alex Bennée, 2020/06/24
- [PATCH v2 14/25] tests/docker: check for an parameters not empty string, Alex Bennée, 2020/06/24
- [PATCH v2 15/25] tests/docker: change tag naming scheme of our images, Alex Bennée, 2020/06/24
- [PATCH v2 21/25] tests/docker: add --registry support to tooling, Alex Bennée, 2020/06/24
- [PATCH v2 13/25] tests/vm: allow us to take advantage of MTTCG, Alex Bennée, 2020/06/24
- [PATCH v2 24/25] gitlab: add avocado asset caching, Alex Bennée, 2020/06/24
- [PATCH v2 23/25] gitlab: enable check-tcg for linux-user tests, Alex Bennée, 2020/06/24
- [PATCH v2 20/25] gitlab: build containers with buildkit and metadata, Alex Bennée, 2020/06/24
- [PATCH v2 19/25] gitlab: convert jobs to use custom built containers, Alex Bennée, 2020/06/24
- [PATCH v2 17/25] gitlab: introduce explicit "container" and "build" stages,
Alex Bennée <=
- [PATCH v2 25/25] gitlab: split build-disabled into two phases, Alex Bennée, 2020/06/24
- [PATCH v2 22/25] gitlab: add acceptance testing to system builds, Alex Bennée, 2020/06/24
- [PATCH v2 18/25] gitlab: build all container images during CI, Alex Bennée, 2020/06/24