diff options
| author | Eric Engestrom <[email protected]> | 2019-10-14 23:04:14 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-10-15 17:42:39 +0100 |
| commit | 81b98e99cd6c54b3b029a817c4c11466a2113e66 (patch) | |
| tree | 1990a01cb7f9c32dd15d7439f741b44fe5419ef7 | |
| parent | 4a3bdc6d229a4c5f550f25c34253d9cba8ce93ef (diff) | |
gitlab-ci: set a common job parent for container stage
While at it, rename to singular "container" for consistency.
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 19 | ||||
| -rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 4 |
2 files changed, 13 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3fa11e10aa7..7c9b82c3898 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index a35a72474b7..bcf4591cd46 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -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} |