diff options
author | Ash McKenzie <ash@the-rebellion.net> | 2019-07-17 05:42:44 +0300 |
---|---|---|
committer | Ash McKenzie <ash@the-rebellion.net> | 2019-07-17 05:42:44 +0300 |
commit | 752b1ed5470b1695772f4b38dc076fbb3c5bb51f (patch) | |
tree | fe702592a72305b6a82995ee399533b0e93ee21a | |
parent | 734b2a67103bd318a164a4f765b1cde327c57137 (diff) |
Add explicit stage: test
-rw-r--r-- | .gitlab-ci.yml | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 057c4443d93..0387bfc2ded 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,33 @@ variables: DOCKER_DRIVER: overlay TEST_IMAGE: registry.gitlab.com/gitlab-org/gitlab-development-kit:latest +# Use eclint to check that the .editorconfig rulesets are being adhered to +verify: + stage: build + image: registry.gitlab.com/gitlab-org/gitlab-build-images:node-10 + script: + - npm config set unsafe-perm true # enable run npm as root + - make verify + +build:image: + image: docker:git + stage: build + script: + # taken from https://gitlab.com/gitlab-org/gitlab-qa/blob/master/.gitlab-ci.yml + - ./bin/docker load + - ./bin/docker build + - ./bin/docker store + - test -n "$CI_BUILD_TOKEN" || exit 0 + - ./bin/docker publish + when: manual + cache: + key: "docker-build-cache" + paths: + - ./latest_image.tar + code_quality: image: docker:stable + stage: test variables: DOCKER_DRIVER: overlay2 allow_failure: true @@ -30,6 +55,7 @@ code_quality: container_scanning: image: docker:stable + stage: test allow_failure: true before_script: [] cache: {} @@ -56,30 +82,6 @@ container_scanning: paths: - gl-sast-container-report.json -# Use eclint to check that the .editorconfig rulesets are being adhered to -verify: - stage: build - image: registry.gitlab.com/gitlab-org/gitlab-build-images:node-10 - script: - - npm config set unsafe-perm true # enable run npm as root - - make verify - -build:image: - image: docker:git - stage: build - script: - # taken from https://gitlab.com/gitlab-org/gitlab-qa/blob/master/.gitlab-ci.yml - - ./bin/docker load - - ./bin/docker build - - ./bin/docker store - - test -n "$CI_BUILD_TOKEN" || exit 0 - - ./bin/docker publish - when: manual - cache: - key: "docker-build-cache" - paths: - - ./latest_image.tar - test:install: image: $TEST_IMAGE stage: test |