diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-18 15:48:20 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-18 15:48:20 +0000 |
| commit | 0d488c7b8a7ab462b78daa20e0f12fe73ebb8a6d (patch) | |
| tree | a69d2c9c8d9cc1da4742aa05d3f274b990630f18 | |
| parent | 5ba542b1094bd8fd95d48d2ac834fd8605cf8fee (diff) | |
| parent | f94a0749ccbca10162a6eabc32024618647c1efa (diff) | |
| download | gitlab-ce-0d488c7b8a7ab462b78daa20e0f12fe73ebb8a6d.tar.gz | |
Merge branch '49324-add-support-for-tar-gz-autodevops-charts' into 'master'
Resolve "Add support for tar.gz AUTO_DEVOPS_CHART charts"
Closes #49324
See merge request gitlab-org/gitlab-ce!20691
| -rw-r--r-- | changelogs/unreleased/49324-add-support-for-tar-gz-autodevops-charts.yml | 5 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/49324-add-support-for-tar-gz-autodevops-charts.yml b/changelogs/unreleased/49324-add-support-for-tar-gz-autodevops-charts.yml new file mode 100644 index 00000000000..a87eef3f7f3 --- /dev/null +++ b/changelogs/unreleased/49324-add-support-for-tar-gz-autodevops-charts.yml @@ -0,0 +1,5 @@ +--- +title: Add support for tar.gz AUTO_DEVOPS_CHART charts (#49324) +merge_request: 20691 +author: '@kondi1' +type: added diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index ee0df7711e7..b698248bc38 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -677,6 +677,7 @@ rollout 100%: auto_chart=${AUTO_DEVOPS_CHART:-gitlab/auto-deploy-app} auto_chart_name=$(basename $auto_chart) auto_chart_name=${auto_chart_name%.tgz} + auto_chart_name=${auto_chart_name%.tar.gz} else auto_chart="chart" auto_chart_name="chart" |