Merge branch 'auto-devops-tags' into 'master'
Add Auto DevOps build job for tags See merge request gitlab-org/gitlab-ce!25718
This commit is contained in:
commit
80fea82f3a
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Adds Auto DevOps build job for tags
|
||||||
|
merge_request: 25718
|
||||||
|
author: walkafwalka
|
||||||
|
type: added
|
|
@ -291,7 +291,7 @@ Auto Build creates a build of the application using an existing `Dockerfile` or
|
||||||
Heroku buildpacks.
|
Heroku buildpacks.
|
||||||
|
|
||||||
Either way, the resulting Docker image is automatically pushed to the
|
Either way, the resulting Docker image is automatically pushed to the
|
||||||
[Container Registry][container-registry] and tagged with the commit SHA.
|
[Container Registry][container-registry] and tagged with the commit SHA or tag.
|
||||||
|
|
||||||
#### Auto Build using a Dockerfile
|
#### Auto Build using a Dockerfile
|
||||||
|
|
||||||
|
|
|
@ -81,6 +81,7 @@ build:
|
||||||
- /build/build.sh
|
- /build/build.sh
|
||||||
only:
|
only:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
|
|
||||||
test:
|
test:
|
||||||
services:
|
services:
|
||||||
|
@ -95,6 +96,7 @@ test:
|
||||||
- /bin/herokuish buildpack test
|
- /bin/herokuish buildpack test
|
||||||
only:
|
only:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
except:
|
except:
|
||||||
variables:
|
variables:
|
||||||
- $TEST_DISABLED
|
- $TEST_DISABLED
|
||||||
|
@ -112,6 +114,7 @@ code_quality:
|
||||||
paths: [gl-code-quality-report.json]
|
paths: [gl-code-quality-report.json]
|
||||||
only:
|
only:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
except:
|
except:
|
||||||
variables:
|
variables:
|
||||||
- $CODE_QUALITY_DISABLED
|
- $CODE_QUALITY_DISABLED
|
||||||
|
@ -129,6 +132,7 @@ license_management:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
variables:
|
variables:
|
||||||
- $GITLAB_FEATURES =~ /\blicense_management\b/
|
- $GITLAB_FEATURES =~ /\blicense_management\b/
|
||||||
except:
|
except:
|
||||||
|
@ -151,6 +155,7 @@ performance:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
kubernetes: active
|
kubernetes: active
|
||||||
except:
|
except:
|
||||||
variables:
|
variables:
|
||||||
|
@ -171,6 +176,7 @@ sast:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
variables:
|
variables:
|
||||||
- $GITLAB_FEATURES =~ /\bsast\b/
|
- $GITLAB_FEATURES =~ /\bsast\b/
|
||||||
except:
|
except:
|
||||||
|
@ -192,6 +198,7 @@ dependency_scanning:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
variables:
|
variables:
|
||||||
- $GITLAB_FEATURES =~ /\bdependency_scanning\b/
|
- $GITLAB_FEATURES =~ /\bdependency_scanning\b/
|
||||||
except:
|
except:
|
||||||
|
@ -212,6 +219,7 @@ container_scanning:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
variables:
|
variables:
|
||||||
- $GITLAB_FEATURES =~ /\bcontainer_scanning\b/
|
- $GITLAB_FEATURES =~ /\bcontainer_scanning\b/
|
||||||
except:
|
except:
|
||||||
|
@ -231,6 +239,7 @@ dast:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
kubernetes: active
|
kubernetes: active
|
||||||
variables:
|
variables:
|
||||||
- $GITLAB_FEATURES =~ /\bdast\b/
|
- $GITLAB_FEATURES =~ /\bdast\b/
|
||||||
|
@ -260,6 +269,7 @@ review:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
kubernetes: active
|
kubernetes: active
|
||||||
except:
|
except:
|
||||||
refs:
|
refs:
|
||||||
|
@ -283,6 +293,7 @@ stop_review:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches
|
- branches
|
||||||
|
- tags
|
||||||
kubernetes: active
|
kubernetes: active
|
||||||
except:
|
except:
|
||||||
refs:
|
refs:
|
||||||
|
@ -488,8 +499,13 @@ rollout 100%:
|
||||||
[[ "$TRACE" ]] && set -x
|
[[ "$TRACE" ]] && set -x
|
||||||
auto_database_url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${CI_ENVIRONMENT_SLUG}-postgres:5432/${POSTGRES_DB}
|
auto_database_url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${CI_ENVIRONMENT_SLUG}-postgres:5432/${POSTGRES_DB}
|
||||||
export DATABASE_URL=${DATABASE_URL-$auto_database_url}
|
export DATABASE_URL=${DATABASE_URL-$auto_database_url}
|
||||||
export CI_APPLICATION_REPOSITORY=$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG
|
if [[ -z "$CI_COMMIT_TAG" ]]; then
|
||||||
export CI_APPLICATION_TAG=$CI_COMMIT_SHA
|
export CI_APPLICATION_REPOSITORY=$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG
|
||||||
|
export CI_APPLICATION_TAG=$CI_COMMIT_SHA
|
||||||
|
else
|
||||||
|
export CI_APPLICATION_REPOSITORY=$CI_REGISTRY_IMAGE
|
||||||
|
export CI_APPLICATION_TAG=$CI_COMMIT_TAG
|
||||||
|
fi
|
||||||
export TILLER_NAMESPACE=$KUBE_NAMESPACE
|
export TILLER_NAMESPACE=$KUBE_NAMESPACE
|
||||||
# Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products
|
# Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products
|
||||||
export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
|
export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
|
||||||
|
|
Loading…
Reference in New Issue