Commit 73d4b1f6 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'revert-1cccfca1' into 'master'

Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"

See merge request gitlab-org/gitlab-ce!23826
parents 75262862 c75c38f8
---
title: Restore kubernetes:active in Auto-DevOps.gitlab-ci.yml (reverts 22929)
merge_request: 23826
author:
type: fixed
...@@ -149,10 +149,10 @@ performance: ...@@ -149,10 +149,10 @@ performance:
only: only:
refs: refs:
- branches - branches
kubernetes: active
except: except:
variables: variables:
- $PERFORMANCE_DISABLED - $PERFORMANCE_DISABLED
- $KUBECONFIG == null
sast: sast:
stage: test stage: test
...@@ -228,6 +228,7 @@ dast: ...@@ -228,6 +228,7 @@ dast:
only: only:
refs: refs:
- branches - branches
kubernetes: active
variables: variables:
- $GITLAB_FEATURES =~ /\bdast\b/ - $GITLAB_FEATURES =~ /\bdast\b/
except: except:
...@@ -235,7 +236,6 @@ dast: ...@@ -235,7 +236,6 @@ dast:
- master - master
variables: variables:
- $DAST_DISABLED - $DAST_DISABLED
- $KUBECONFIG == null
review: review:
stage: review stage: review
...@@ -257,12 +257,12 @@ review: ...@@ -257,12 +257,12 @@ review:
only: only:
refs: refs:
- branches - branches
kubernetes: active
except: except:
refs: refs:
- master - master
variables: variables:
- $REVIEW_DISABLED - $REVIEW_DISABLED
- $KUBECONFIG == null
stop_review: stop_review:
stage: cleanup stage: cleanup
...@@ -280,12 +280,12 @@ stop_review: ...@@ -280,12 +280,12 @@ stop_review:
only: only:
refs: refs:
- branches - branches
kubernetes: active
except: except:
refs: refs:
- master - master
variables: variables:
- $REVIEW_DISABLED - $REVIEW_DISABLED
- $KUBECONFIG == null
# Staging deploys are disabled by default since # Staging deploys are disabled by default since
# continuous deployment to production is enabled by default # continuous deployment to production is enabled by default
...@@ -309,11 +309,9 @@ staging: ...@@ -309,11 +309,9 @@ staging:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $STAGING_ENABLED - $STAGING_ENABLED
except:
variables:
- $KUBECONFIG == null
# Canaries are also disabled by default, but if you want them, # Canaries are also disabled by default, but if you want them,
# and know what the downsides are, you can enable this by setting # and know what the downsides are, you can enable this by setting
...@@ -336,11 +334,9 @@ canary: ...@@ -336,11 +334,9 @@ canary:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $CANARY_ENABLED - $CANARY_ENABLED
except:
variables:
- $KUBECONFIG == null
.production: &production_template .production: &production_template
stage: production stage: production
...@@ -366,13 +362,13 @@ production: ...@@ -366,13 +362,13 @@ production:
only: only:
refs: refs:
- master - master
kubernetes: active
except: except:
variables: variables:
- $STAGING_ENABLED - $STAGING_ENABLED
- $CANARY_ENABLED - $CANARY_ENABLED
- $INCREMENTAL_ROLLOUT_ENABLED - $INCREMENTAL_ROLLOUT_ENABLED
- $INCREMENTAL_ROLLOUT_MODE - $INCREMENTAL_ROLLOUT_MODE
- $KUBECONFIG == null
production_manual: production_manual:
<<: *production_template <<: *production_template
...@@ -381,6 +377,7 @@ production_manual: ...@@ -381,6 +377,7 @@ production_manual:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $STAGING_ENABLED - $STAGING_ENABLED
- $CANARY_ENABLED - $CANARY_ENABLED
...@@ -388,7 +385,6 @@ production_manual: ...@@ -388,7 +385,6 @@ production_manual:
variables: variables:
- $INCREMENTAL_ROLLOUT_ENABLED - $INCREMENTAL_ROLLOUT_ENABLED
- $INCREMENTAL_ROLLOUT_MODE - $INCREMENTAL_ROLLOUT_MODE
- $KUBECONFIG == null
# This job implements incremental rollout on for every push to `master`. # This job implements incremental rollout on for every push to `master`.
...@@ -418,13 +414,13 @@ production_manual: ...@@ -418,13 +414,13 @@ production_manual:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $INCREMENTAL_ROLLOUT_MODE == "manual" - $INCREMENTAL_ROLLOUT_MODE == "manual"
- $INCREMENTAL_ROLLOUT_ENABLED - $INCREMENTAL_ROLLOUT_ENABLED
except: except:
variables: variables:
- $INCREMENTAL_ROLLOUT_MODE == "timed" - $INCREMENTAL_ROLLOUT_MODE == "timed"
- $KUBECONFIG == null
.timed_rollout_template: &timed_rollout_template .timed_rollout_template: &timed_rollout_template
<<: *rollout_template <<: *rollout_template
...@@ -433,11 +429,9 @@ production_manual: ...@@ -433,11 +429,9 @@ production_manual:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $INCREMENTAL_ROLLOUT_MODE == "timed" - $INCREMENTAL_ROLLOUT_MODE == "timed"
except:
variables:
- $KUBECONFIG == null
timed rollout 10%: timed rollout 10%:
<<: *timed_rollout_template <<: *timed_rollout_template
......
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