diff options
| author | walkafwalka <2865898-walkafwalka@users.noreply.gitlab.com> | 2019-03-02 22:54:44 -0800 |
|---|---|---|
| committer | walkafwalka <2865898-walkafwalka@users.noreply.gitlab.com> | 2019-03-02 23:47:53 -0800 |
| commit | fec6797e5a1ff2f0080ae772e5c4ad973b04f1b7 (patch) | |
| tree | 06429169c7688ff0b41c3d24078fd9f1ecdefa60 | |
| parent | 190a6a1e6728ff9425154fe9ccacaa75039854c7 (diff) | |
| download | gitlab-ce-fec6797e5a1ff2f0080ae772e5c4ad973b04f1b7.tar.gz | |
Add build for tags
| -rw-r--r-- | changelogs/unreleased/auto-devops-tags.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 16 |
2 files changed, 19 insertions, 2 deletions
diff --git a/changelogs/unreleased/auto-devops-tags.yml b/changelogs/unreleased/auto-devops-tags.yml new file mode 100644 index 00000000000..1b96d457776 --- /dev/null +++ b/changelogs/unreleased/auto-devops-tags.yml @@ -0,0 +1,5 @@ +--- +title: Adds Auto DevOps build job for tags +merge_request: 25718 +author: walkafwalka +type: added diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index c0d4d4400b3..7e355d0e9fe 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -81,6 +81,7 @@ build: - /build/build.sh only: - branches + - tags test: services: @@ -95,6 +96,7 @@ test: - /bin/herokuish buildpack test only: - branches + - tags except: variables: - $TEST_DISABLED @@ -112,6 +114,7 @@ code_quality: paths: [gl-code-quality-report.json] only: - branches + - tags except: variables: - $CODE_QUALITY_DISABLED @@ -129,6 +132,7 @@ license_management: only: refs: - branches + - tags variables: - $GITLAB_FEATURES =~ /\blicense_management\b/ except: @@ -171,6 +175,7 @@ sast: only: refs: - branches + - tags variables: - $GITLAB_FEATURES =~ /\bsast\b/ except: @@ -192,6 +197,7 @@ dependency_scanning: only: refs: - branches + - tags variables: - $GITLAB_FEATURES =~ /\bdependency_scanning\b/ except: @@ -212,6 +218,7 @@ container_scanning: only: refs: - branches + - tags variables: - $GITLAB_FEATURES =~ /\bcontainer_scanning\b/ except: @@ -488,8 +495,13 @@ rollout 100%: [[ "$TRACE" ]] && set -x auto_database_url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${CI_ENVIRONMENT_SLUG}-postgres:5432/${POSTGRES_DB} export DATABASE_URL=${DATABASE_URL-$auto_database_url} - export CI_APPLICATION_REPOSITORY=$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG - export CI_APPLICATION_TAG=$CI_COMMIT_SHA + if [[ -z "$CI_COMMIT_TAG" ]]; then + 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 # 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/') |