summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2018-05-11 14:20:19 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-05-11 15:39:25 +0100
commite72c25742d989c246a6903e16e67c9140815a088 (patch)
tree12329efddf2e1a7f66837183c467334c5c6d42ae /vendor
parentf811495e86aff85b0b9729b40a5fd00973157261 (diff)
downloadgitlab-ce-e72c25742d989c246a6903e16e67c9140815a088.tar.gz
Merge branch 'vendor-auto-devops-template' into 'master'
Vendor Auto DevOps template See merge request gitlab-org/gitlab-ce!18876
Diffstat (limited to 'vendor')
-rw-r--r--vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml54
1 files changed, 18 insertions, 36 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
index 020031af3cb..a00c6e89a1d 100644
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -12,8 +12,10 @@
# AUTO_DEVOPS_DOMAIN must also be set as a variable at the group or project
# level, or manually added below.
#
-# If you want to deploy to staging first, or enable canary deploys,
-# uncomment the relevant jobs in the pipeline below.
+# Continuous deployment to production is enabled by default.
+# If you want to deploy to staging first, or enable incremental rollouts,
+# set STAGING_ENABLED or INCREMENTAL_ROLLOUT_ENABLED environment variables.
+# If you want to use canary deployments, uncomment the canary job.
#
# If Auto DevOps fails to detect the proper buildpack, or if you want to
# specify a custom buildpack, set a project variable `BUILDPACK_URL` to the
@@ -88,14 +90,6 @@ codequality:
artifacts:
paths: [codeclimate.json]
-license_management:
- image: registry.gitlab.com/gitlab-org/security-products/license-management:latest
- allow_failure: true
- script:
- - license_management
- artifacts:
- paths: [gl-license-report.json]
-
performance:
stage: performance
image: docker:stable
@@ -223,8 +217,8 @@ stop_review:
# Staging deploys are disabled by default since
# continuous deployment to production is enabled by default
# If you prefer to automatically deploy to staging and
-# only manually promote to production, enable this job by removing the dot (.),
-# and uncomment the `when: manual` line in the `production` job.
+# only manually promote to production, enable this job by setting
+# STAGING_ENABLED.
staging:
stage: staging
@@ -245,13 +239,9 @@ staging:
kubernetes: active
variables:
- $STAGING_ENABLED
- except:
- variables:
- - $INCREMENTAL_ROLLOUT_ENABLED
# Canaries are disabled by default, but if you want them,
-# and know what the downsides are, enable this job by removing the dot (.),
-# and uncomment the `when: manual` line in the `production` job.
+# and know what the downsides are, enable this job by removing the dot (.).
.canary:
stage: canary
@@ -272,11 +262,6 @@ staging:
- master
kubernetes: active
-# This job continuously deploys to production on every push to `master`.
-# To make this a manual process, either because you're enabling `staging`
-# or `canary` deploys, or you simply want more control over when you deploy
-# to production, uncomment the `when: manual` line in the `production` job.
-
.production: &production_template
stage: production
script:
@@ -310,6 +295,7 @@ production:
production_manual:
<<: *production_template
when: manual
+ allow_failure: false
only:
refs:
- master
@@ -345,6 +331,7 @@ rollout 10%:
<<: *rollout_template
variables:
ROLLOUT_PERCENTAGE: 10
+ when: manual
only:
refs:
- master
@@ -379,6 +366,7 @@ rollout 50%:
rollout 100%:
<<: *production_template
when: manual
+ allow_failure: false
only:
refs:
- master
@@ -428,14 +416,6 @@ rollout 100%:
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
}
- function license_management() {
- if echo $GITLAB_FEATURES |grep license_management > /dev/null ; then
- /run.sh .
- else
- echo "License management is not available in your subscription"
- fi
- }
-
function sast() {
case "$CI_SERVER_VERSION" in
*-ee)
@@ -562,12 +542,14 @@ rollout 100%:
replicas=$(get_replicas "$track" "$percentage")
- helm upgrade --reuse-values \
- --wait \
- --set replicaCount="$replicas" \
- --namespace="$KUBE_NAMESPACE" \
- "$name" \
- chart/
+ if [[ -n "$(helm ls -q "^$name$")" ]]; then
+ helm upgrade --reuse-values \
+ --wait \
+ --set replicaCount="$replicas" \
+ --namespace="$KUBE_NAMESPACE" \
+ "$name" \
+ chart/
+ fi
}
function install_dependencies() {