diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-12 11:12:07 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-12 11:12:07 +0000 |
| commit | 3300143b50fa8c1275ea164d489689e0278d869b (patch) | |
| tree | c99b4f3c3fbd56ecc14075a915ef746a062a7411 | |
| parent | 71dbd613982c6f247b3897e2d012a261904178a4 (diff) | |
| parent | 37f9cf8a26a115970ab61dee84e9a4732052bcde (diff) | |
| download | gitlab-ce-3300143b50fa8c1275ea164d489689e0278d869b.tar.gz | |
Merge branch '58781-silent-progress-in-auto-devops' into 'master'
Use curl silent/show-error options on Auto DevOps' deploy
Closes #58781
See merge request gitlab-org/gitlab-ce!25954
| -rw-r--r-- | changelogs/unreleased/58781-silent-progress-in-auto-devops.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/changelogs/unreleased/58781-silent-progress-in-auto-devops.yml b/changelogs/unreleased/58781-silent-progress-in-auto-devops.yml new file mode 100644 index 00000000000..e45db8eafc3 --- /dev/null +++ b/changelogs/unreleased/58781-silent-progress-in-auto-devops.yml @@ -0,0 +1,5 @@ +--- +title: Use curl silent/show-error options on Auto DevOps +merge_request: 25954 +author: Takuya Noguchi +type: other diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 6c99e20e7af..3c46eb36cdb 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -780,18 +780,18 @@ rollout 100%: function install_dependencies() { apk add -U openssl curl tar gzip bash ca-certificates git - curl -L -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub - curl -L -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk + curl -sSL -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub + curl -sSL -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk apk add glibc-2.28-r0.apk rm glibc-2.28-r0.apk - curl "https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx + curl -sS "https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx mv linux-amd64/helm /usr/bin/ mv linux-amd64/tiller /usr/bin/ helm version --client tiller -version - curl -L -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl" + curl -sSL -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl" chmod +x /usr/bin/kubectl kubectl version --client } |