Merge branch 'an-node-10' into 'master'

Add a node-10 image

See merge request gitlab-org/gitlab-build-images!164
This commit is contained in:
Andrew Newdigate 2019-03-06 11:20:45 +00:00
commit bf3f4cc5c3

View file

@ -52,6 +52,9 @@ before_script:
# Tests
# Used by GDK verify step: https://gitlab.com/gitlab-org/gitlab-development-kit
node-10 test: *test_custom
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.4-golang-1.11-git-2.18 test: *test_custom
ruby-2.5-golang-1.10-git-2.18 test: *test_custom
@ -112,6 +115,9 @@ gitlab-docs-lint test: *test_build
# Builds
# Used by GDK verify step: https://gitlab.com/gitlab-org/gitlab-development-kit
node-10: *build_and_deploy_custom
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.4-golang-1.11-git-2.18: *build_and_deploy_custom
ruby-2.5-golang-1.10-git-2.18: *build_and_deploy_custom