diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-11-03 22:50:55 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-11-03 22:50:55 +0000 |
| commit | 5d4f377bfd50cb1b2b1980f036b18c7b5d2b137f (patch) | |
| tree | 17bc1cdd427400fef53d8f2e76abd57a3ea1ba73 /.gitlab-ci.yml | |
| parent | ae470ae2b52491c283639c4c3006145909c7c27b (diff) | |
| parent | cc00b289f9c466a9e4aa711a16ab8758b9e6656f (diff) | |
| download | gitlab-ce-5d4f377bfd50cb1b2b1980f036b18c7b5d2b137f.tar.gz | |
Merge branch 'sh-headless-chrome-support' into 'master'
Replace PhantomJS with Headless Chrome for GitLab Integration Tests
Closes #30876
See merge request gitlab-org/gitlab-ce!12244
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32d66bebf03..fed5971233d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.13-chrome-62.0-node-8.x-yarn-1.2-postgresql-9.6" .default-cache: &default-cache key: "ruby-235-with-yarn" @@ -23,7 +23,6 @@ variables: SIMPLECOV: "true" GIT_DEPTH: "20" GIT_SUBMODULE_STRATEGY: "none" - PHANTOMJS_VERSION: "2.1.1" GET_SOURCES_ATTEMPTS: "3" KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json @@ -551,7 +550,6 @@ karma: <<: *dedicated-runner <<: *except-docs <<: *pull-cache - image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.13-chrome-61.0-node-8.x-yarn-1.0-postgresql-9.6" stage: test variables: BABEL_ENV: "coverage" |