diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-14 13:38:41 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-14 13:38:41 +0000 |
| commit | e610b41e2458601fb1821dcf46a15dc758e032bd (patch) | |
| tree | 7d50e860730af9c95b994bbf7ec1a9790a3c8ad3 | |
| parent | 3ae483dea3275939e8124f9038daf48bba6dbff6 (diff) | |
| parent | 8ab5642c25cc6b2751d82759cd2654ccf14c89c1 (diff) | |
| download | gitlab-ce-e610b41e2458601fb1821dcf46a15dc758e032bd.tar.gz | |
Merge branch '50257-fix-auto-devops-glibc-pubkey-url' into 'master'
Resolve "Auto Devops failing to fetch Alpine glibc pubkey"
Closes gitlab-org/quality/nightly#3 and #50257
See merge request gitlab-org/gitlab-ce!21182
| -rw-r--r-- | changelogs/unreleased/50257-fix-auto-devops-glibc-pubkey-url.yml | 5 | ||||
| -rw-r--r-- | qa/qa/specs/features/project/auto_devops_spec.rb | 2 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/50257-fix-auto-devops-glibc-pubkey-url.yml b/changelogs/unreleased/50257-fix-auto-devops-glibc-pubkey-url.yml new file mode 100644 index 00000000000..e081dfe6093 --- /dev/null +++ b/changelogs/unreleased/50257-fix-auto-devops-glibc-pubkey-url.yml @@ -0,0 +1,5 @@ +--- +title: 'Auto-DevOps.gitlab-ci.yml: Update glibc package signing key URL' +merge_request: 21182 +author: sgerrand +type: fixed diff --git a/qa/qa/specs/features/project/auto_devops_spec.rb b/qa/qa/specs/features/project/auto_devops_spec.rb index bc713b46d81..c2c3bef98e4 100644 --- a/qa/qa/specs/features/project/auto_devops_spec.rb +++ b/qa/qa/specs/features/project/auto_devops_spec.rb @@ -50,7 +50,7 @@ module QA Page::Project::Pipeline::Show.perform do |pipeline| expect(pipeline).to have_build('build', status: :success, wait: 600) expect(pipeline).to have_build('test', status: :success, wait: 600) - expect(pipeline).to have_build('production', status: :success, wait: 600) + expect(pipeline).to have_build('production', status: :success, wait: 1200) end end end diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index dae80c6542d..39876805ffa 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -641,7 +641,7 @@ rollout 100%: function install_dependencies() { apk add -U openssl curl tar gzip bash ca-certificates git - wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub + wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk apk add glibc-2.23-r3.apk rm glibc-2.23-r3.apk |