Commit ff252f61 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch...

Merge branch '41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runner' into 'master'

Include updated AutoDevOps template with Browser Performance using DinD

Closes #41809

See merge request gitlab-org/gitlab-ce!16373
parents 7951acfd 9d7e0e49
...@@ -90,10 +90,14 @@ codequality: ...@@ -90,10 +90,14 @@ codequality:
performance: performance:
stage: performance stage: performance
image: image: docker:latest
name: sitespeedio/sitespeed.io:6.0.3 variables:
entrypoint: [""] DOCKER_DRIVER: overlay2
allow_failure: true
services:
- docker:dind
script: script:
- setup_docker
- performance - performance
artifacts: artifacts:
paths: paths:
...@@ -478,9 +482,9 @@ production: ...@@ -478,9 +482,9 @@ production:
if [ -f .gitlab-urls.txt ] if [ -f .gitlab-urls.txt ]
then then
sed -i -e 's@^@'"$CI_ENVIRONMENT_URL"'@' .gitlab-urls.txt sed -i -e 's@^@'"$CI_ENVIRONMENT_URL"'@' .gitlab-urls.txt
/start.sh --plugins.add gitlab-exporter --outputFolder sitespeed-results .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
else else
/start.sh --plugins.add gitlab-exporter --outputFolder sitespeed-results $CI_ENVIRONMENT_URL 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"
fi fi
mv sitespeed-results/data/performance.json performance.json mv sitespeed-results/data/performance.json performance.json
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment