Skip to content

Commit e0c56d7

Browse files
author
Slavek Kabrda
authored
Update CircleCI image to latest Ubuntu 20.04 (#734)
1 parent 0ef342e commit e0c56d7

1 file changed

Lines changed: 34 additions & 17 deletions

File tree

.circleci/config.yml

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ orbs:
33
win: circleci/windows@2.2.0
44
jobs:
55
specs-ruby21-puppet46: &specs
6-
machine: true
6+
machine:
7+
image: ubuntu-2004:202201-02
78
environment:
89
STRICT_VARIABLES: 'yes'
910
RUBY_VERSION: '2.1.9'
@@ -14,6 +15,17 @@ jobs:
1415
name: Fix git clones
1516
command: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
1617
- checkout
18+
- run:
19+
name: Install old libssl1.0-dev
20+
command: |
21+
ruby_major=$(echo $RUBY_VERSION | awk -F. '{ print $1 }')
22+
ruby_minor=$(echo $RUBY_VERSION | awk -F. '{ print $2 }')
23+
# We need libssl1.0-dev to even compile Ruby <= 2.3 with RVM;
24+
if [ $ruby_major -eq "2" ] && [ $ruby_minor -le "3" ]; then
25+
sudo bash -c "echo deb http://security.ubuntu.com/ubuntu bionic-security main >> /etc/apt/sources.list"
26+
sudo apt update && apt-cache policy libssl1.0-dev
27+
sudo apt install -y libssl1.0-dev
28+
fi
1729
- run:
1830
name: Install Ruby version
1931
command: rvm install $RUBY_VERSION
@@ -126,12 +138,17 @@ jobs:
126138
RUBY_VERSION: '2.3.6'
127139
PUPPET_VERSION: '6.5.0'
128140

129-
specs-ruby24-puppet46:
130-
<<: *specs
131-
environment:
132-
STRICT_VARIABLES: 'yes'
133-
RUBY_VERSION: '2.4.3'
134-
PUPPET_VERSION: '4.6.2'
141+
# Puppet < 5 doesn't work with Ruby when it's compiled with libssl > 1.0 - see
142+
# https://bugzilla.redhat.com/show_bug.cgi?id=1440710 for details - but RVM
143+
# refuses to compile with older libssl. We could use --autolibs=0 RVM option,
144+
# but then we'd have to manually install all deps ourselves and maintain that
145+
# solution... So we just disable specs-ruby24-puppet46 and specs-ruby25-puppet46.
146+
# specs-ruby24-puppet46:
147+
# <<: *specs
148+
# environment:
149+
# STRICT_VARIABLES: 'yes'
150+
# RUBY_VERSION: '2.4.3'
151+
# PUPPET_VERSION: '4.6.2'
135152

136153
specs-ruby24-puppet410:
137154
<<: *specs
@@ -168,12 +185,12 @@ jobs:
168185
RUBY_VERSION: '2.4.3'
169186
PUPPET_VERSION: '6.5.0'
170187

171-
specs-ruby25-puppet46:
172-
<<: *specs
173-
environment:
174-
STRICT_VARIABLES: 'yes'
175-
RUBY_VERSION: '2.5.3'
176-
PUPPET_VERSION: '4.6.2'
188+
# specs-ruby25-puppet46:
189+
# <<: *specs
190+
# environment:
191+
# STRICT_VARIABLES: 'yes'
192+
# RUBY_VERSION: '2.5.3'
193+
# PUPPET_VERSION: '4.6.2'
177194

178195
specs-ruby25-puppet410:
179196
<<: *specs
@@ -266,7 +283,8 @@ jobs:
266283
PUPPET_VERSION: '6.5.0'
267284

268285
verify-gemfile-lock-dependencies:
269-
machine: true
286+
machine:
287+
image: ubuntu-2004:202201-02
270288
environment:
271289
STRICT_VARIABLES: 'yes'
272290
RUBY_VERSION: '2.5.3'
@@ -290,7 +308,8 @@ jobs:
290308
command: rvm $RUBY_VERSION --verbose do bundle exec rake test
291309

292310
kitchen-tests:
293-
machine: true
311+
machine:
312+
image: ubuntu-2004:202201-02
294313
environment:
295314
STRICT_VARIABLES: 'yes'
296315
RUBY_VERSION: '2.5.3'
@@ -332,13 +351,11 @@ workflows:
332351
- specs-ruby23-puppet53
333352
- specs-ruby23-puppet60
334353
- specs-ruby23-puppet65
335-
- specs-ruby24-puppet46
336354
- specs-ruby24-puppet410
337355
- specs-ruby24-puppet50
338356
- specs-ruby24-puppet53
339357
- specs-ruby24-puppet60
340358
- specs-ruby24-puppet65
341-
- specs-ruby25-puppet46
342359
- specs-ruby25-puppet410
343360
- specs-ruby25-puppet50
344361
- specs-ruby25-puppet53

0 commit comments

Comments
 (0)