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

(chore) Update Ubuntu image tags #818

Closed
wants to merge 13 commits into from
Closed

(chore) Update Ubuntu image tags #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4e6a82f
202201-02 -> 2024.08.1
tbavelier Nov 6, 2024
1b07039
rvm full path
tbavelier Nov 6, 2024
0198620
revert rvm full path and try 2022.10.1
tbavelier Nov 6, 2024
fceb303
Try 2023.02.1
tbavelier Nov 7, 2024
3b3342b
Try pinning lower ffi version
tbavelier Nov 7, 2024
5320ca9
bundle install
tbavelier Nov 7, 2024
b1ce763
Try rvm install
tbavelier Nov 7, 2024
5bc403c
Revert Gemfile.lock
tbavelier Nov 7, 2024
e06d939
Use latest image - no rvm
tbavelier Nov 7, 2024
07a07d8
Pin ffi version
tbavelier Nov 7, 2024
3a5dc19
Pin ffi version
tbavelier Nov 7, 2024
c1dee99
Do not pin ffi on windows + bundle update ffi
tbavelier Nov 7, 2024
8c8b0ec
Fix OpenSUSE kitchen test
tbavelier Nov 7, 2024
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
21 changes: 18 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ orbs:
jobs:
specs-ruby21-puppet46: &specs
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2004:2024.08.1
environment:
STRICT_VARIABLES: 'yes'
RUBY_VERSION: '2.1.9'
Expand All @@ -15,6 +15,11 @@ jobs:
name: Fix git clones
command: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
- checkout
- run:
name: Install RVM
command: |
gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
\curl -sSL https://get.rvm.io | bash -s stable
- run:
name: Install old libssl1.0-dev
command: |
Expand Down Expand Up @@ -290,7 +295,7 @@ jobs:

verify-gemfile-lock-dependencies:
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2004:2024.08.1
environment:
STRICT_VARIABLES: 'yes'
RUBY_VERSION: '2.5.3'
Expand All @@ -300,6 +305,11 @@ jobs:
name: Fix git clones
command: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
- checkout
- run:
name: Install RVM
command: |
gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
\curl -sSL https://get.rvm.io | bash -s stable
- run:
name: Install Ruby versions
command: rvm install $RUBY_VERSION
Expand All @@ -315,7 +325,7 @@ jobs:

kitchen-tests:
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2004:2024.08.1
environment:
STRICT_VARIABLES: 'yes'
RUBY_VERSION: '2.5.3'
Expand All @@ -325,6 +335,11 @@ jobs:
name: Fix git clones
command: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
- checkout
- run:
name: Install RVM
command: |
gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
\curl -sSL https://get.rvm.io | bash -s stable
- run:
name: Install Ruby versions
command: rvm install $RUBY_VERSION
Expand Down
7 changes: 7 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ group :development do
gem "rubocop-i18n", "~> 1.2.0"
gem "rubocop-rspec", "~> 1.16.0"

# https://github.com/ffi/ffi/issues/1103 (pin only for Ruby >= 2.5 as this version is not compatible below. ffi 1.17 is not compatible with Ruby 2.5: https://github.com/ffi/ffi/issues/1103)
if ruby_version >= Gem::Version.new('2.5')
gem "ffi", "= 1.16.3", platforms: [:ruby]
else
gem "ffi", require: false, platforms: [:mswin, :mingw, :x64_mingw]
end

if ruby_version >= Gem::Version.new('2.3')
gem "test-kitchen", '~> 2.5.4'
gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
Expand Down
7 changes: 5 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ GEM
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
fast_gettext (1.1.2)
ffi (1.15.4)
ffi (1.16.3)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
Expand Down Expand Up @@ -485,11 +485,13 @@ PLATFORMS
ruby

DEPENDENCIES
concurrent-ruby (= 1.1.10)
fast_gettext
ffi (= 1.16.3)
kitchen-docker
kitchen-puppet
kitchen-verifier-serverspec
librarian-puppet
librarian-puppet (<= 4.0.1)
mixlib-shellout (~> 2.2.7)
puppet (~> 7.0.0)
puppet-module-posix-default-r2.7
Expand All @@ -500,6 +502,7 @@ DEPENDENCIES
rubocop-i18n (~> 1.2.0)
rubocop-rspec (~> 1.16.0)
ruby-pwsh (~> 0.3.0)
semantic_puppet (= 1.0.4)
test-kitchen (~> 2.5.4)
xmlrpc

Expand Down
1 change: 1 addition & 0 deletions kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ platforms:
- zypper install -y puppet-agent ruby=2.5
- gem install bundler -v '= 1.17.3'
- gem install net-ssh -v '= 6.1.0'
- gem install rspec-its -v '= 1.3.1'
- gem install serverspec rspec
- ln -s /usr/bin/rspec.ruby2.5 /usr/bin/rspec
- ln -s /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
Expand Down
Loading