Skip to content

Commit b84343e

Browse files
committed
ci: update the container images and refactor steps
1 parent 20bf1d5 commit b84343e

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

Diff for: .gitlab-ci.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
stage_test: &stage_test 'test'
1515
# `image`
1616
image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
17-
image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3'
18-
image_dindrubybionic: &image_dindrubybionic 'myii/ssf-dind-ruby-bionic:2.7.5-1bbox1'
19-
image_precommit: &image_precommit
20-
name: 'myii/ssf-pre-commit:2.9.2'
21-
entrypoint: ['/bin/bash', '-c']
17+
image_dindruby: &image_dindruby
18+
'dafyddj/ci-dind-python-ruby:2.0.0'
19+
image_dindrubybionic: &image_dindrubybionic
20+
'dafyddj/ci-dind-python-ruby:2.0.0'
21+
image_precommit: &image_precommit 'dafyddj/ci-pre-commit:2.0.2'
2222
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
2323
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
2424
# `services`
@@ -139,10 +139,8 @@ rubocop:
139139
- 'export CONVERTED=test-the-use_this_template-button'
140140
- 'git clone . /tmp/"${CONVERTED}"-formula'
141141
- 'cd /tmp/"${CONVERTED}"-formula'
142-
# Limit the version of `node` used by `pre-commit`, to avoid the following error:
143-
# .../bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found
144-
- 'echo "default_language_version:" >> .pre-commit-config.yaml'
145-
- 'echo " node: 16.14.2" >> .pre-commit-config.yaml'
142+
- 'git config user.email "[email protected]"'
143+
- 'git config user.name "Test Name"'
146144
# Install `pre-commit` hooks
147145
- 'bin/install-hooks'
148146
# Run the conversion script with debug output
@@ -153,9 +151,7 @@ rubocop:
153151
# TODO: This should work from the env vars above automatically
154152
- 'bundle config set path "${BUNDLE_CACHE_PATH}"'
155153
- 'bundle config set without "${BUNDLE_WITHOUT}"'
156-
- 'bundle update --bundler --conservative'
157-
- 'bundle binstubs bundler --force'
158-
- 'PATH=./bin:"$PATH" bundle install'
154+
- 'bundle install'
159155
script:
160156
- 'bin/kitchen verify default-debian-11-master-py3'
161157
# REMOVEME>

0 commit comments

Comments
 (0)