Fix CI (#819)

DataDog · Nov 7, 2024 · f7d8383 · f7d8383
1 parent 80c293a
commit f7d8383
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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'
@@ -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: |
@@ -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'
@@ -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
@@ -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'
@@ -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

diff --git a/Gemfile b/Gemfile
@@ -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]

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -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
@@ -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
@@ -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
 

diff --git a/kitchen.yml b/kitchen.yml
@@ -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