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
This commit is contained in:
commit
ff252f61f7
|
@ -90,10 +90,14 @@ codequality:
|
|||
|
||||
performance:
|
||||
stage: performance
|
||||
image:
|
||||
name: sitespeedio/sitespeed.io:6.0.3
|
||||
entrypoint: [""]
|
||||
image: docker:latest
|
||||
variables:
|
||||
DOCKER_DRIVER: overlay2
|
||||
allow_failure: true
|
||||
services:
|
||||
- docker:dind
|
||||
script:
|
||||
- setup_docker
|
||||
- performance
|
||||
artifacts:
|
||||
paths:
|
||||
|
@ -112,7 +116,7 @@ sast:
|
|||
- sast .
|
||||
artifacts:
|
||||
paths: [gl-sast-report.json]
|
||||
|
||||
|
||||
sast:container:
|
||||
image: docker:latest
|
||||
variables:
|
||||
|
@ -260,7 +264,7 @@ production:
|
|||
export CI_APPLICATION_TAG=$CI_COMMIT_SHA
|
||||
export CI_CONTAINER_NAME=ci_job_build_${CI_JOB_ID}
|
||||
export TILLER_NAMESPACE=$KUBE_NAMESPACE
|
||||
|
||||
|
||||
function sast_container() {
|
||||
docker run -d --name db arminc/clair-db:latest
|
||||
docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
|
||||
|
@ -466,26 +470,26 @@ production:
|
|||
--docker-email="$GITLAB_USER_EMAIL" \
|
||||
-o yaml --dry-run | kubectl replace -n "$KUBE_NAMESPACE" --force -f -
|
||||
}
|
||||
|
||||
|
||||
function performance() {
|
||||
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
|
||||
|
||||
|
||||
mkdir sitespeed-results
|
||||
|
||||
|
||||
if [ -f .gitlab-urls.txt ]
|
||||
then
|
||||
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
|
||||
/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
|
||||
|
||||
|
||||
mv sitespeed-results/data/performance.json performance.json
|
||||
}
|
||||
|
||||
|
||||
function persist_environment_url() {
|
||||
echo $CI_ENVIRONMENT_URL > environment_url.txt
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue