diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-08 00:28:14 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-02-08 00:28:14 +0000 |
| commit | d3560d493175ea45df3181917fbcee195a93c0aa (patch) | |
| tree | 2b2642804bd39ac2c218ddb698d0715e3e9b076f | |
| parent | 6ffb030bbbaf7a194eebbfb703ac5bbdf3de2614 (diff) | |
| parent | 794506a2c5a5ac6b233f0cee26781a0aec6ebfe0 (diff) | |
| download | gitlab-ce-d3560d493175ea45df3181917fbcee195a93c0aa.tar.gz | |
Merge branch '42864-update-vendored-autodevops-yml-for-latest-browser-performance-testing-changes' into 'master'
Update vendored AutoDevOps YML for latest Browser Performance Testing changes
Closes #42864
See merge request gitlab-org/gitlab-ce!16982
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index a7cd2bc972c..b2439d96e00 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -103,6 +103,7 @@ performance: artifacts: paths: - performance.json + - sitespeed-results/ only: refs: - branches @@ -503,16 +504,16 @@ production: export CI_ENVIRONMENT_URL=$(cat environment_url.txt) mkdir gitlab-exporter - wget -O gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/10-3/index.js + wget -O gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/10-5/index.js mkdir sitespeed-results if [ -f .gitlab-urls.txt ] then sed -i -e 's@^@'"$CI_ENVIRONMENT_URL"'@' .gitlab-urls.txt - docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:6.0.3 --plugins.add ./gitlab-exporter --outputFolder sitespeed-results .gitlab-urls.txt + docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:6.3.1 --plugins.add ./gitlab-exporter --outputFolder sitespeed-results .gitlab-urls.txt else - docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:6.0.3 --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "$CI_ENVIRONMENT_URL" + docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:6.3.1 --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "$CI_ENVIRONMENT_URL" fi mv sitespeed-results/data/performance.json performance.json |