summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-10-14 23:04:14 +0100
committerEric Engestrom <eric.engestrom@intel.com>2019-10-15 17:42:39 +0100
commit81b98e99cd6c54b3b029a817c4c11466a2113e66 (patch)
tree1990a01cb7f9c32dd15d7439f741b44fe5419ef7 /.gitlab-ci
parent4a3bdc6d229a4c5f550f25c34253d9cba8ce93ef (diff)
downloadmesa-81b98e99cd6c54b3b029a817c4c11466a2113e66.tar.gz
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>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml4
1 files changed, 1 insertions, 3 deletions
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}