diff --git a/Gemfile b/Gemfile index 82c4a312..15a77c3d 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,8 @@ source 'https://rubygems.org' gem 'inspec', '~> 4.22.22' # Install the `kitchen-docker` gem from GitHub because the latest version # currently available (`2.10.0`) doesn't include a recent fix for Gentoo. -gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' +# rubocop:disable Layout/LineLength +gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' +# rubocop:enable Layout/LineLength gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 19bf26d4..d7cbc3b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: https://github.com/test-kitchen/kitchen-docker.git - revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848 - ref: 41e80fe + remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker + revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + branch: ssf specs: kitchen-docker (2.10.0) test-kitchen (>= 1.0.0) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 855b7d8b..bfe11ca4 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -62,8 +62,8 @@ ssf_node_anchors: # An alternative method could be to use: # `git describe --abbrev=0 --tags` # yamllint disable rule:line-length rule:quoted-strings - title: "chore: standardise structure ('`'.gitignore'`' & '`'_mapdata.rb'`') [skip ci]" - body: '* Automated using https://github.com/myii/ssf-formula/pull/292' + title: "ci(gemfile+lock): use '`'ssf'`' customised '`'kitchen-docker'`' repo [skip ci]" + body: '* Automated using https://github.com/myii/ssf-formula/pull/294' # yamllint enable rule:line-length rule:quoted-strings github: owner: 'saltstack-formulas' diff --git a/ssf/files/default/Gemfile b/ssf/files/default/Gemfile index 82c4a312..15a77c3d 100644 --- a/ssf/files/default/Gemfile +++ b/ssf/files/default/Gemfile @@ -7,6 +7,8 @@ source 'https://rubygems.org' gem 'inspec', '~> 4.22.22' # Install the `kitchen-docker` gem from GitHub because the latest version # currently available (`2.10.0`) doesn't include a recent fix for Gentoo. -gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' +# rubocop:disable Layout/LineLength +gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' +# rubocop:enable Layout/LineLength gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' diff --git a/ssf/files/default/Gemfile.lock b/ssf/files/default/Gemfile.lock index 19bf26d4..d7cbc3b1 100644 --- a/ssf/files/default/Gemfile.lock +++ b/ssf/files/default/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: https://github.com/test-kitchen/kitchen-docker.git - revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848 - ref: 41e80fe + remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker + revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + branch: ssf specs: kitchen-docker (2.10.0) test-kitchen (>= 1.0.0) diff --git a/ssf/files/tofs_openssh-formula/Gemfile b/ssf/files/tofs_openssh-formula/Gemfile index 900e5cf4..768d2a73 100644 --- a/ssf/files/tofs_openssh-formula/Gemfile +++ b/ssf/files/tofs_openssh-formula/Gemfile @@ -7,7 +7,9 @@ source 'https://rubygems.org' gem 'inspec', '~> 4.22.22' # Install the `kitchen-docker` gem from GitHub because the latest version # currently available (`2.10.0`) doesn't include a recent fix for Gentoo. -gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' +# rubocop:disable Layout/LineLength +gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' +# rubocop:enable Layout/LineLength gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' diff --git a/ssf/files/tofs_openssh-formula/Gemfile.lock b/ssf/files/tofs_openssh-formula/Gemfile.lock index 75baeadb..ef26d96b 100644 --- a/ssf/files/tofs_openssh-formula/Gemfile.lock +++ b/ssf/files/tofs_openssh-formula/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: https://github.com/test-kitchen/kitchen-docker.git - revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848 - ref: 41e80fe + remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker + revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + branch: ssf specs: kitchen-docker (2.10.0) test-kitchen (>= 1.0.0) diff --git a/ssf/files/tofs_openvpn-formula/Gemfile b/ssf/files/tofs_openvpn-formula/Gemfile index a650a997..7c8befe2 100644 --- a/ssf/files/tofs_openvpn-formula/Gemfile +++ b/ssf/files/tofs_openvpn-formula/Gemfile @@ -7,7 +7,9 @@ source 'https://rubygems.org' gem 'inspec', '~> 4.22.22' # Install the `kitchen-docker` gem from GitHub because the latest version # currently available (`2.10.0`) doesn't include a recent fix for Gentoo. -gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' +# rubocop:disable Layout/LineLength +gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' +# rubocop:enable Layout/LineLength gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' gem 'rspec-retry' diff --git a/ssf/files/tofs_openvpn-formula/Gemfile.lock b/ssf/files/tofs_openvpn-formula/Gemfile.lock index 02e3bcb0..0cc1955f 100644 --- a/ssf/files/tofs_openvpn-formula/Gemfile.lock +++ b/ssf/files/tofs_openvpn-formula/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: https://github.com/test-kitchen/kitchen-docker.git - revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848 - ref: 41e80fe + remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker + revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + branch: ssf specs: kitchen-docker (2.10.0) test-kitchen (>= 1.0.0)