diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 21:09:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 21:09:07 +0300 |
| commit | 6b8d671de726534a03c18e025a586e1bc9c04a4f (patch) | |
| tree | f6a9168160b0d435641a1767b2e68487ec75ae46 /lib | |
| parent | 163a7046ac76eb4109184e82ce0af911633e6626 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
4 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml index c3ca44eea9e..20063cf6a69 100644 --- a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml @@ -1,12 +1,10 @@ performance: stage: performance - # pin to a version matching the dind service, just to be safe image: docker:19.03.5 allow_failure: true variables: DOCKER_TLS_CERTDIR: "" services: - # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed - docker:19.03.5-dind script: - | diff --git a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml index 488945ffa3e..bb0de9df8bf 100644 --- a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml @@ -4,7 +4,6 @@ build: variables: DOCKER_TLS_CERTDIR: "" services: - # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed - docker:19.03.5-dind script: - | diff --git a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml index dd5144e28a7..5b8d41bbd10 100644 --- a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml @@ -1,10 +1,8 @@ code_quality: stage: test - # pin to a version matching the dind service, just to be safe image: docker:19.03.5 allow_failure: true services: - # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed - docker:19.03.5-dind variables: DOCKER_DRIVER: overlay2 diff --git a/lib/quality/kubernetes_client.rb b/lib/quality/kubernetes_client.rb index 453b9d21adb..f83652e117f 100644 --- a/lib/quality/kubernetes_client.rb +++ b/lib/quality/kubernetes_client.rb @@ -48,7 +48,8 @@ module Quality resource_names = raw_resource_names command = [ 'delete', - %(--namespace "#{namespace}") + %(--namespace "#{namespace}"), + '--ignore-not-found' ] Array(release_name).each do |release| |