diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 16:54:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 16:54:19 +0000 |
| commit | 6fa199c93052754da2d410ff77a21d077cea3088 (patch) | |
| tree | 100a6dd2666eb822e320bbd197ea4989a6b97de2 | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
| download | gitlab-ce-6fa199c93052754da2d410ff77a21d077cea3088.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/fix-ado-postgresql-pvc-deletion.yml b/changelogs/unreleased/fix-ado-postgresql-pvc-deletion.yml new file mode 100644 index 00000000000..d981fc9f70c --- /dev/null +++ b/changelogs/unreleased/fix-ado-postgresql-pvc-deletion.yml @@ -0,0 +1,5 @@ +--- +title: Updated Auto DevOps with a fix to delete PostgreSQL PVC on environment cleanup +merge_request: 34657 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml index 5174aed04ba..99f5dba996d 100644 --- a/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml @@ -1,5 +1,5 @@ .dast-auto-deploy: - image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.15.0" + image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.16.3" dast_environment_deploy: extends: .dast-auto-deploy diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 3fbae496896..79f5e1b12f5 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -1,5 +1,5 @@ .auto-deploy: - image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.15.0" + image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.16.3" include: - template: Jobs/Deploy/ECS.gitlab-ci.yml |