Commit dccca378 authored by Matija Čupić's avatar Matija Čupić

Merge branch 'bump-major-version-ad-image-in-ad' into 'master'

Renew the Auto Deploy stable template by the latest template [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!62876
parents 982a234e 01563909
---
name: redirect_to_latest_template_jobs_deploy
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332660
milestone: '14.0'
type: development
group: group::pipeline authoring
default_enabled: false
...@@ -174,6 +174,8 @@ include: ...@@ -174,6 +174,8 @@ include:
- remote: https://gitlab.com/gitlab-org/gitlab/-/raw/v13.3.0-ee/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml - remote: https://gitlab.com/gitlab-org/gitlab/-/raw/v13.3.0-ee/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
``` ```
Alternatively, you can use the [v13.12 Auto DevOps templates archive](https://gitlab.com/hfyngvason/auto-devops-v13-12).
### Ignore warnings and continue deploying ### Ignore warnings and continue deploying
If you are certain that the new chart version is safe to be deployed, you can add If you are certain that the new chart version is safe to be deployed, you can add
......
.dast-auto-deploy: .dast-auto-deploy:
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.7" image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v2.6.0"
dast_environment_deploy: dast_environment_deploy:
extends: .dast-auto-deploy extends: .dast-auto-deploy
......
.auto-deploy: .auto-deploy:
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.7" image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v2.6.0"
dependencies: [] dependencies: []
review: review:
...@@ -91,7 +91,7 @@ canary: ...@@ -91,7 +91,7 @@ canary:
- auto-deploy ensure_namespace - auto-deploy ensure_namespace
- auto-deploy initialize_tiller - auto-deploy initialize_tiller
- auto-deploy create_secret - auto-deploy create_secret
- auto-deploy deploy canary - auto-deploy deploy canary 50
environment: environment:
name: production name: production
url: http://$CI_PROJECT_PATH_SLUG.$KUBE_INGRESS_BASE_DOMAIN url: http://$CI_PROJECT_PATH_SLUG.$KUBE_INGRESS_BASE_DOMAIN
...@@ -114,7 +114,6 @@ canary: ...@@ -114,7 +114,6 @@ canary:
- auto-deploy create_secret - auto-deploy create_secret
- auto-deploy deploy - auto-deploy deploy
- auto-deploy delete canary - auto-deploy delete canary
- auto-deploy delete rollout
- auto-deploy persist_environment_url - auto-deploy persist_environment_url
environment: environment:
name: production name: production
...@@ -163,9 +162,7 @@ production_manual: ...@@ -163,9 +162,7 @@ production_manual:
- auto-deploy ensure_namespace - auto-deploy ensure_namespace
- auto-deploy initialize_tiller - auto-deploy initialize_tiller
- auto-deploy create_secret - auto-deploy create_secret
- auto-deploy deploy rollout $ROLLOUT_PERCENTAGE - auto-deploy deploy canary $ROLLOUT_PERCENTAGE
- auto-deploy scale stable $((100-ROLLOUT_PERCENTAGE))
- auto-deploy delete canary
- auto-deploy persist_environment_url - auto-deploy persist_environment_url
environment: environment:
name: production name: production
......
...@@ -6,7 +6,6 @@ module Gitlab ...@@ -6,7 +6,6 @@ module Gitlab
BASE_EXCLUDED_PATTERNS = [%r{\.latest\.}].freeze BASE_EXCLUDED_PATTERNS = [%r{\.latest\.}].freeze
TEMPLATES_WITH_LATEST_VERSION = { TEMPLATES_WITH_LATEST_VERSION = {
'Jobs/Deploy' => true,
'Jobs/Browser-Performance-Testing' => true, 'Jobs/Browser-Performance-Testing' => true,
'Security/API-Fuzzing' => true, 'Security/API-Fuzzing' => true,
'Security/DAST' => true, 'Security/DAST' => true,
......
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