Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pipeline(*): bump tools in docker images #377

Merged
merged 5 commits into from
Aug 13, 2021
Merged

pipeline(*): bump tools in docker images #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5201393
pipeline(k8s): auto-inject `$COA_ROOT_DEPLOYMENT_NAME`
o-orand Aug 10, 2021
1df0208
bump to latest gov.uk images
o-orand Aug 11, 2021
fb1f1f0
chore(ci): reduce DockerHub load and enhance code climate upload
o-orand Aug 12, 2021
1ed8a09
chore(ci) bump to latest gem (git, rake, rubocop ...)
o-orand Aug 12, 2021
2d9347a
task(generate_single_concourse_pipeline_config): ensure pipeline are …
o-orand Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ gem 'rhcl', '>= 0.1.0'

group :development do
gem 'docker_registry2', '>= 1.10.0'
gem 'git', '>=1.8.1'
gem 'git', '>=1.9.1'
gem 'github_changelog_generator', '>= 1.16.4'
gem 'mdl', '>=0.11.0'
gem 'rake', '>=12.2.1'
gem 'rake', '>=13.0.6'
gem 'reek', '>= 6.0.1'
gem 'rubocop', '>= 0.88.0'
gem 'rubocop-rspec', '>= 1.38.1'
gem 'rubocop', '>= 1.19.0'
gem 'rubocop-rspec', '>= 2.0.4'
end

group :test do
Expand Down
127 changes: 61 additions & 66 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,96 +1,101 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.3.2)
activesupport (6.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2)
async (1.29.0)
async (1.30.1)
console (~> 1.10)
nio4r (~> 2.3)
timers (~> 4.1)
async-http (0.56.2)
async (~> 1.25)
async-io (~> 1.28)
async-pool (~> 0.2)
async-http (0.56.5)
async (>= 1.25)
async-io (>= 1.28)
async-pool (>= 0.2)
protocol-http (~> 0.22.0)
protocol-http1 (~> 0.14.0)
protocol-http2 (~> 0.14.0)
async-http-faraday (0.9.0)
async-http-faraday (0.11.0)
async-http (~> 0.42)
faraday
async-io (1.32.0)
async (~> 1.14)
async-pool (0.3.6)
async (~> 1.25)
async-io (1.32.2)
async
async-pool (0.3.8)
async (>= 1.25)
builder (3.2.4)
chef-utils (17.1.35)
chef-utils (17.3.48)
concurrent-ruby
concurrent-ruby (1.1.8)
console (1.12.0)
concurrent-ruby (1.1.9)
console (1.13.1)
fiber-local
cucumber (6.1.0)
cucumber (7.0.0)
builder (~> 3.2, >= 3.2.4)
cucumber-core (~> 9.0, >= 9.0.1)
cucumber-create-meta (~> 4.0, >= 4.0.0)
cucumber-core (~> 10.0, >= 10.0.1)
cucumber-create-meta (~> 6.0, >= 6.0.1)
cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
cucumber-gherkin (~> 18.1, >= 18.1.0)
cucumber-html-formatter (~> 13.0, >= 13.0.0)
cucumber-messages (~> 15.0, >= 15.0.0)
cucumber-wire (~> 5.0, >= 5.0.1)
cucumber-gherkin (~> 20.0, >= 20.0.1)
cucumber-html-formatter (~> 16.0, >= 16.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
cucumber-wire (~> 6.0, >= 6.0.1)
diff-lcs (~> 1.4, >= 1.4.4)
mime-types (~> 3.3, >= 3.3.1)
multi_test (~> 0.1, >= 0.1.2)
sys-uname (~> 1.2, >= 1.2.2)
cucumber-core (9.0.1)
cucumber-gherkin (~> 18.1, >= 18.1.0)
cucumber-messages (~> 15.0, >= 15.0.0)
cucumber-core (10.0.1)
cucumber-gherkin (~> 20.0, >= 20.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
cucumber-tag-expressions (~> 3.0, >= 3.0.1)
cucumber-create-meta (4.0.0)
cucumber-messages (~> 15.0, >= 15.0.0)
cucumber-create-meta (6.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
sys-uname (~> 1.2, >= 1.2.2)
cucumber-cucumber-expressions (12.1.1)
cucumber-gherkin (18.1.1)
cucumber-messages (~> 15.0, >= 15.0.0)
cucumber-html-formatter (13.0.0)
cucumber-messages (~> 15.0, >= 15.0.0)
cucumber-messages (15.0.0)
protobuf-cucumber (~> 3.10, >= 3.10.8)
cucumber-gherkin (20.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
cucumber-html-formatter (16.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
cucumber-messages (17.0.1)
cucumber-tag-expressions (3.0.1)
cucumber-wire (5.0.1)
cucumber-core (~> 9.0, >= 9.0.1)
cucumber-wire (6.1.0)
cucumber-core (~> 10.0, >= 10.0.1)
cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
cucumber-messages (~> 15.0, >= 15.0.0)
cucumber-messages (~> 17.0, >= 17.0.1)
deep_merge (1.2.1)
diff-lcs (1.4.4)
docile (1.4.0)
docker_registry2 (1.10.0)
rest-client (>= 1.8.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
faraday (1.4.2)
faraday (1.7.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-http-cache (2.2.0)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
ffi (1.15.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
ffi (1.15.3)
fiber-local (1.0.0)
git (1.8.1)
git (1.9.1)
rchardet (~> 1.8)
github_changelog_generator (1.16.4)
activesupport
Expand All @@ -102,7 +107,7 @@ GEM
rainbow (>= 2.2.1)
rake (>= 10.0)
http-accept (1.7.0)
http-cookie (1.0.3)
http-cookie (1.0.4)
domain_name (~> 0.5)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
Expand All @@ -117,10 +122,9 @@ GEM
mixlib-cli (~> 2.1, >= 2.1.1)
mixlib-config (>= 2.2.1, < 4)
mixlib-shellout
middleware (0.1.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mime-types-data (3.2021.0704)
minitest (5.14.4)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
Expand All @@ -131,34 +135,27 @@ GEM
multi_test (0.1.2)
multipart-post (2.1.1)
netrc (0.11.0)
nio4r (2.5.7)
nio4r (2.5.8)
octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.20.1)
parser (3.0.1.1)
parser (3.0.2.0)
ast (~> 2.4.1)
protobuf-cucumber (3.10.8)
activesupport (>= 3.2)
middleware
thor
thread_safe
protocol-hpack (1.4.2)
protocol-http (0.22.0)
protocol-http (0.22.5)
protocol-http1 (0.14.1)
protocol-http (~> 0.22)
protocol-http2 (0.14.2)
protocol-hpack (~> 1.4)
protocol-http (~> 0.18)
psych (3.3.2)
public_suffix (4.0.6)
rainbow (3.0.0)
rake (13.0.3)
rake (13.0.6)
rchardet (1.8.0)
reek (6.0.4)
reek (6.0.6)
kwalify (~> 0.7.0)
parser (~> 3.0.0)
psych (~> 3.1)
rainbow (>= 2.0, < 4.0)
regexp_parser (2.1.1)
rest-client (2.1.0)
Expand All @@ -184,22 +181,22 @@ GEM
rspec-rerun (1.1.0)
rspec (~> 3.0)
rspec-support (3.10.2)
rubocop (1.16.0)
rubocop (1.19.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.7.0, < 2.0)
rubocop-ast (>= 1.9.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.7.0)
rubocop-ast (1.9.1)
parser (>= 3.0.1.1)
rubocop-rspec (2.3.0)
rubocop-rspec (2.4.0)
rubocop (~> 1.0)
rubocop-ast (>= 1.1.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.4)
ruby2_keywords (0.0.5)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
Expand All @@ -211,8 +208,6 @@ GEM
simplecov_json_formatter (0.1.3)
sys-uname (1.2.2)
ffi (~> 1.1)
thor (1.1.0)
thread_safe (0.3.6)
timers (4.3.3)
tomlrb (2.0.1)
tzinfo (2.0.4)
Expand All @@ -229,16 +224,16 @@ PLATFORMS
DEPENDENCIES
cucumber
docker_registry2 (>= 1.10.0)
git (>= 1.8.1)
git (>= 1.9.1)
github_changelog_generator (>= 1.16.4)
mdl (>= 0.11.0)
rake (>= 12.2.1)
rake (>= 13.0.6)
reek (>= 6.0.1)
rhcl (>= 0.1.0)
rspec (>= 3.10.0)
rspec-rerun
rubocop (>= 0.88.0)
rubocop-rspec (>= 1.38.1)
rubocop (>= 1.19.0)
rubocop-rspec (>= 2.0.4)
simplecov (~> 0.21.2)

RUBY VERSION
Expand Down
11 changes: 9 additions & 2 deletions ci/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,11 @@ jobs:
cc-test-reporter before-build
bundle exec rspec --format documentation --format html --out ../test-reports/rspec-results.html
echo "Sending coverage to Code Climate"
cc-test-reporter after-build -d
if [[ $(cc-test-reporter after-build) -eq 0 ]]; then
echo "Failed to run cc-test-reporter. Re-launch in debug mode";
echo "---------------------------"
cc-test-reporter after-build -d;
fi
params:
CC_TEST_REPORTER_ID: ((code-climate-test-reporter-id))
COVERAGE: true
Expand Down Expand Up @@ -365,7 +369,7 @@ jobs:
type: registry-image
source:
repository: governmentpaas/bosh-cli-v2
tag: f4817cce4038ac072c06507ca9d255392489d967
tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
inputs:
- name: cf-ops-automation
params:
Expand Down Expand Up @@ -677,6 +681,7 @@ jobs:
passed: [pull-requests-build-cached-image]
trigger: true
- get: cf-ops-automation
passed: [pull-requests-build-cached-image]
resource: pr-develop
trigger: true
version: every
Expand Down Expand Up @@ -711,6 +716,7 @@ jobs:
passed: [pull-requests-build-cached-image]
trigger: true
- get: cf-ops-automation
passed: [pull-requests-build-cached-image]
resource: pr-develop
trigger: true
version: every
Expand Down Expand Up @@ -747,6 +753,7 @@ jobs:
passed: [pull-requests-build-cached-image]
trigger: true
- get: cf-ops-automation
passed: [pull-requests-build-cached-image]
resource: pr-develop
trigger: true
version: every
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/bootstrap-all-init-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ jobs:
type: registry-image
source:
repository: governmentpaas/curl-ssl
tag: f4817cce4038ac072c06507ca9d255392489d967
tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
inputs:
- name: final-control-plane-pipeline
- name: secrets-full
Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
type: registry-image
source:
repository: governmentpaas/bosh-cli-v2
tag: f4817cce4038ac072c06507ca9d255392489d967
tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
inputs:
- name: scripts-resource
- name: secrets
Expand Down Expand Up @@ -346,7 +346,7 @@ jobs:
type: registry-image
source:
repository: governmentpaas/curl-ssl
tag: f4817cce4038ac072c06507ca9d255392489d967
tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
inputs:
- name: concourse-teams
outputs:
Expand Down Expand Up @@ -432,7 +432,7 @@ jobs:
type: registry-image
source:
repository: governmentpaas/curl-ssl
tag: f4817cce4038ac072c06507ca9d255392489d967
tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
inputs:
- name: all-pipelines
outputs:
Expand Down
Loading