gitlab-ci: set a common job parent for container stage

While at it, rename to singular "container" for consistency.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Eric Engestrom 2019-10-14 23:04:14 +01:00
parent 4a3bdc6d22
commit 81b98e99cd
2 changed files with 13 additions and 10 deletions

View File

@ -32,7 +32,7 @@ include:
- local: '/.gitlab-ci/lava-gitlab-ci.yml'
stages:
- containers
- container
- build
- test
@ -59,13 +59,19 @@ stages:
# Build the normal CI native and cross-build docker images.
.container:
stage: container
extends:
- .ci-run-policy
variables:
# no need to pull the whole repo to build the container image
GIT_STRATEGY: none
debian-10:
extends:
- .debian@container-ifnot-exists
- .ci-run-policy
stage: containers
- .container
variables:
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
.use-debian-10:
@ -91,13 +97,12 @@ debian-9:
test-container:arm64:
extends:
- .debian@container-ifnot-exists@arm64v8
- .ci-run-policy
stage: containers
- .container
variables:
DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh'
# BUILD
.build:

View File

@ -22,10 +22,8 @@ include:
.lava-container:
extends:
- .debian@container-ifnot-exists
- .ci-run-policy
stage: containers
- .container
variables:
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
DEBIAN_TAG: '${DEBIAN_ARCH}-${LAVA_IMAGE_TAG}'
DEBIAN_EXEC: 'DEBIAN_ARCH=${DEBIAN_ARCH}
GCC_ARCH=${GCC_ARCH}