diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-09-11 18:51:46 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2019-09-13 13:26:09 +0100 |
| commit | a0f8a073087276e7e9b97c82df36f39840a081d4 (patch) | |
| tree | a6aba0d12ecefa0836c9ccb124023b74a6272241 | |
| parent | c9bebae2877e55cdcd94f9f9f3f6805238caeb28 (diff) | |
gitlab-ci: rename stages to something simpler
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5dc20348a0..9a5d50737b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # This is the tag of the docker image used for the build jobs. If the -# image doesn't exist yet, the containers-build stage generates it. +# image doesn't exist yet, the containers stage generates it. # # In order to generate a new image, one should generally change the tag. # While removing the image from the registry would also work, that's not @@ -27,8 +27,8 @@ include: file: '/templates/debian.yml' stages: - - containers-build - - build+test + - containers + - build - test @@ -55,7 +55,7 @@ stages: # Builds the normal CI native and cross-build docker image. debian: extends: .debian@container-ifnot-exists - stage: containers-build + stage: containers <<: *ci-run-policy variables: GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image @@ -65,7 +65,7 @@ debian: test-container:arm64: extends: .debian@container-ifnot-exists@arm64v8 <<: *ci-run-policy - stage: containers-build + stage: containers variables: DEBIAN_TAG: "$DEBIAN_ARM64_TAG" DEBIAN_VERSION: "$DEBIAN_ARM64_VERSION" @@ -77,7 +77,7 @@ test-container:arm64: .build: <<: *ci-run-policy image: $DEBIAN_IMAGE - stage: build+test + stage: build cache: paths: - ccache |