From 4e6a82fa018341083ee4f66361ac6adcc339b9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Wed, 6 Nov 2024 15:54:24 +0100 Subject: [PATCH 01/13] 202201-02 -> 2024.08.1 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 415f66f5..9a4d34c6 100644 --- 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' @@ -290,7 +290,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' @@ -315,7 +315,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' From 1b07039e7039c580cec2f8ae08a8effc37585923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Wed, 6 Nov 2024 16:17:28 +0100 Subject: [PATCH 02/13] rvm full path --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a4d34c6..849535f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,16 +28,16 @@ jobs: fi - run: name: Install Ruby version - command: rvm install $RUBY_VERSION + command: /usr/share/rvm install $RUBY_VERSION - run: name: Install bundler - command: rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 + command: /usr/share/rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 - run: name: Install gem dependencies - command: rm Gemfile.lock && rvm $RUBY_VERSION --verbose do bundle install --path .bundle + command: rm Gemfile.lock && /usr/share/rvm $RUBY_VERSION --verbose do bundle install --path .bundle - run: name: Run tests - command: rvm $RUBY_VERSION --verbose do bundle exec rake test + command: /usr/share/rvm $RUBY_VERSION --verbose do bundle exec rake test specs-ruby21-puppet410: <<: *specs @@ -302,16 +302,16 @@ jobs: - checkout - run: name: Install Ruby versions - command: rvm install $RUBY_VERSION + command: /usr/share/rvm install $RUBY_VERSION - run: name: Install bundler - command: rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 + command: /usr/share/rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 - run: name: Install gem dependencies - command: rvm $RUBY_VERSION --verbose do bundle install --path .bundle + command: /usr/share/rvm $RUBY_VERSION --verbose do bundle install --path .bundle - run: name: Run tests - command: rvm $RUBY_VERSION --verbose do bundle exec rake test + command: /usr/share/rvm $RUBY_VERSION --verbose do bundle exec rake test kitchen-tests: machine: @@ -327,16 +327,16 @@ jobs: - checkout - run: name: Install Ruby versions - command: rvm install $RUBY_VERSION + command: /usr/share/rvm install $RUBY_VERSION - run: name: Install bundler - command: rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 + command: /usr/share/rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 - run: name: Install gem dependencies - command: rvm $RUBY_VERSION --verbose do bundle install --path .bundle + command: /usr/share/rvm $RUBY_VERSION --verbose do bundle install --path .bundle - run: name: Execute Kitchen tests - command: rvm $RUBY_VERSION --verbose do bundle exec rake circle + command: /usr/share/rvm $RUBY_VERSION --verbose do bundle exec rake circle no_output_timeout: 900 workflows: From 0198620e68b6467abff43570afffff36e1cb0a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Wed, 6 Nov 2024 16:20:43 +0100 Subject: [PATCH 03/13] revert rvm full path and try 2022.10.1 --- .circleci/config.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 849535f4..58582bfb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ orbs: jobs: specs-ruby21-puppet46: &specs machine: - image: ubuntu-2004:2024.08.1 + image: ubuntu-2004:2022.10.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.1.9' @@ -28,16 +28,16 @@ jobs: fi - run: name: Install Ruby version - command: /usr/share/rvm install $RUBY_VERSION + command: rvm install $RUBY_VERSION - run: name: Install bundler - command: /usr/share/rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 + command: rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 - run: name: Install gem dependencies - command: rm Gemfile.lock && /usr/share/rvm $RUBY_VERSION --verbose do bundle install --path .bundle + command: rm Gemfile.lock && rvm $RUBY_VERSION --verbose do bundle install --path .bundle - run: name: Run tests - command: /usr/share/rvm $RUBY_VERSION --verbose do bundle exec rake test + command: rvm $RUBY_VERSION --verbose do bundle exec rake test specs-ruby21-puppet410: <<: *specs @@ -290,7 +290,7 @@ jobs: verify-gemfile-lock-dependencies: machine: - image: ubuntu-2004:2024.08.1 + image: ubuntu-2004:2022.10.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.5.3' @@ -302,20 +302,20 @@ jobs: - checkout - run: name: Install Ruby versions - command: /usr/share/rvm install $RUBY_VERSION + command: rvm install $RUBY_VERSION - run: name: Install bundler - command: /usr/share/rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 + command: rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 - run: name: Install gem dependencies - command: /usr/share/rvm $RUBY_VERSION --verbose do bundle install --path .bundle + command: rvm $RUBY_VERSION --verbose do bundle install --path .bundle - run: name: Run tests - command: /usr/share/rvm $RUBY_VERSION --verbose do bundle exec rake test + command: rvm $RUBY_VERSION --verbose do bundle exec rake test kitchen-tests: machine: - image: ubuntu-2004:2024.08.1 + image: ubuntu-2004:2022.10.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.5.3' @@ -327,16 +327,16 @@ jobs: - checkout - run: name: Install Ruby versions - command: /usr/share/rvm install $RUBY_VERSION + command: rvm install $RUBY_VERSION - run: name: Install bundler - command: /usr/share/rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 + command: rvm $RUBY_VERSION --verbose do gem install bundler:1.17.3 - run: name: Install gem dependencies - command: /usr/share/rvm $RUBY_VERSION --verbose do bundle install --path .bundle + command: rvm $RUBY_VERSION --verbose do bundle install --path .bundle - run: name: Execute Kitchen tests - command: /usr/share/rvm $RUBY_VERSION --verbose do bundle exec rake circle + command: rvm $RUBY_VERSION --verbose do bundle exec rake circle no_output_timeout: 900 workflows: From fceb303e8ba388386b9bd8a199d736dd05d7ce74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 10:34:22 +0100 Subject: [PATCH 04/13] Try 2023.02.1 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 58582bfb..3806cc69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ orbs: jobs: specs-ruby21-puppet46: &specs machine: - image: ubuntu-2004:2022.10.1 + image: ubuntu-2004:2023.02.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.1.9' @@ -290,7 +290,7 @@ jobs: verify-gemfile-lock-dependencies: machine: - image: ubuntu-2004:2022.10.1 + image: ubuntu-2004:2023.02.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.5.3' @@ -315,7 +315,7 @@ jobs: kitchen-tests: machine: - image: ubuntu-2004:2022.10.1 + image: ubuntu-2004:2023.02.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.5.3' From 3b3342b57a286272d094362629b6f0946597d93c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 10:46:27 +0100 Subject: [PATCH 05/13] Try pinning lower ffi version --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 49ac4af6..8773d0c6 100644 --- 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.17.0) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -485,11 +485,12 @@ PLATFORMS ruby DEPENDENCIES + concurrent-ruby (= 1.1.10) fast_gettext 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 +501,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 From 5320ca9e8971e769c4b4840f85d4e317afaaf4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 10:49:14 +0100 Subject: [PATCH 06/13] bundle install --- Gemfile.lock | 338 +++++++++++++++++++++++++++------------------------ 1 file changed, 181 insertions(+), 157 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8773d0c6..432daf0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,34 +1,38 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) - activesupport (6.1.6.1) + CFPropertyList (3.0.7) + base64 + nkf + rexml + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ansi (1.5.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.609.0) - aws-sdk-core (3.131.3) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-eventstream (1.3.0) + aws-partitions (1.1001.0) + aws-sdk-core (3.212.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.323.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.1) + aws-sdk-ec2 (1.487.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) - bcrypt_pbkdf (1.1.0) - bindata (2.4.10) - bolt (3.24.0) - CFPropertyList (~> 2.2) + base64 (0.2.0) + bcrypt_pbkdf (1.1.1) + bindata (2.5.0) + bolt (3.30.0) + CFPropertyList (>= 2.2) addressable (~> 2.5) aws-sdk-ec2 (~> 1) concurrent-ruby (~> 1.0) @@ -37,61 +41,80 @@ GEM jwt (~> 2.2) logging (~> 2.2) minitar (~> 0.6) - net-scp (~> 1.2) - net-ssh (>= 4.0, < 7.0) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 4.0, < 8.0) net-ssh-krb (~> 0.5) orchestrator_client (~> 0.5) puppet (>= 6.18.0) puppet-resource_api (>= 1.8.1) - puppet-strings (~> 2.3) - puppetfile-resolver (~> 0.5) + puppet-strings (>= 2.3.0, < 5.0) + puppetfile-resolver (>= 0.6.2, < 1.0) r10k (~> 3.10) ruby_smb (~> 1.0) terminal-table (~> 3.0) winrm (~> 2.0) winrm-fs (~> 1.3) - builder (3.2.4) + builder (3.3.0) codecov (0.2.5) colorize json simplecov coderay (1.1.3) colored2 (3.1.2) - colorize (0.8.1) + colorize (1.1.0) concurrent-ruby (1.1.10) - connection_pool (2.2.5) - cri (2.15.11) + connection_pool (2.4.1) + cri (2.15.12) deep_merge (1.2.2) - dependency_checker (0.2.0) + dependency_checker (0.3.0) parallel - puppet_forge (~> 2.2) - rake (~> 12.3) + puppet_forge (>= 2.2, < 4.0) + rake (~> 13.0) semantic_puppet (~> 1.0) - diff-lcs (1.5.0) - docile (1.4.0) - docker-api (2.2.0) - excon (>= 0.47.0) + diff-lcs (1.5.1) + docile (1.4.1) + docker-api (2.4.0) + excon (>= 0.64.0) multi_json - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - ed25519 (1.2.4) - equatable (0.7.0) - erubi (1.10.0) - excon (0.92.4) - facter (4.2.10) + domain_name (0.6.20240107) + ed25519 (1.3.0) + erubi (1.13.0) + excon (1.1.1) + facter (4.10.0) hocon (~> 1.3) - thor (>= 1.0.1, < 2.0) - facterdb (1.19.0) + thor (>= 1.0.1, < 1.3) + facterdb (1.27.0) facter (< 5.0.0) - jgrep - faraday (0.17.4) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.14.0) - faraday (>= 0.7.4, < 1.0) + jgrep (~> 1.5, >= 1.5.4) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) fast_gettext (1.1.2) - ffi (< 1.17.0) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) + ffi (1.17.0) + ffi-compiler (1.3.2) + ffi (>= 1.15.5) rake gettext (3.2.9) locale (>= 2.0.5) @@ -102,55 +125,55 @@ GEM locale gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.3.1) + gyoku (1.4.0) builder (>= 2.1.2) - hiera (3.9.0) - hiera-eyaml (3.3.0) + rexml (~> 3.0) + hiera (3.12.0) + hiera-eyaml (3.4.0) highline optimist - highline (2.0.3) + highline (2.1.0) hirb (0.7.3) - hocon (1.3.1) - honeycomb-beeline (2.11.0) - libhoney (>= 1.14.2) - http (4.4.1) - addressable (~> 2.3) + hocon (1.4.0) + honeycomb-beeline (3.1.0) + libhoney (>= 2.3.0) + http (5.2.0) + addressable (~> 2.8) + base64 (~> 0.1) http-cookie (~> 1.0) http-form_data (~> 2.2) - http-parser (~> 1.2.0) + llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) jgrep (1.5.4) - jmespath (1.6.1) - json (2.6.2) + jmespath (1.6.2) + json (2.8.1) json-schema (2.8.1) addressable (>= 2.4) - jwt (2.2.3) - kitchen-docker (2.11.0) + jwt (2.7.1) + kitchen-docker (3.0.0) test-kitchen (>= 1.0.0) - kitchen-puppet (3.5.2) + kitchen-puppet (3.7.0) librarian-puppet (>= 3.0) net-ssh (>= 3) test-kitchen (>= 1.4) - kitchen-verifier-serverspec (0.7.1) + kitchen-verifier-serverspec (0.7.2) net-ssh (>= 3) test-kitchen (>= 1.4) - libhoney (2.2.0) + libhoney (2.4.0) addressable (~> 2.0) excon http (>= 2.0, < 6.0) - librarian-puppet (3.0.1) + librarian-puppet (4.0.1) librarianp (>= 0.6.3) - puppet_forge (~> 2.1) + puppet_forge (>= 2.1, < 4) rsync - librarianp (1.1.1) + librarianp (1.1.2) thor (~> 1.0) license-acceptance (1.0.19) pastel (~> 0.7) @@ -158,9 +181,13 @@ GEM tty-box (~> 0.3) tty-prompt (~> 0.18) little-plugger (1.1.4) - locale (2.1.3) + llhttp-ffi (0.5.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + locale (2.1.4) log4r (1.1.10) - logging (2.3.0) + logger (1.6.1) + logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) metaclass (0.0.4) @@ -168,12 +195,13 @@ GEM json-schema (~> 2.8) spdx-licenses (~> 1.0) method_source (0.8.2) - mime-types (3.4.1) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - minitar (0.9) - minitest (5.16.2) - mixlib-install (3.12.16) + mime-types-data (3.2024.1105) + minitar (0.12.1) + minitest (5.25.1) + mixlib-install (3.12.30) mixlib-shellout mixlib-versioning thor @@ -183,12 +211,11 @@ GEM metaclass (~> 0.0.1) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.1.1) - necromancer (0.5.1) - net-http-persistent (4.0.1) + multipart-post (2.4.1) + net-http-persistent (4.0.4) connection_pool (~> 2.2) - net-scp (1.2.1) - net-ssh (>= 2.6.5) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) @@ -197,18 +224,18 @@ GEM net-ssh (>= 2.0) net-telnet (0.1.1) netrc (0.11.0) + nkf (0.2.0) nori (2.6.0) - optimist (3.0.1) - orchestrator_client (0.5.4) - faraday (~> 0.17.4) - net-http-persistent - parallel (1.20.1) + optimist (3.1.0) + orchestrator_client (0.7.0) + faraday (~> 1.4) + net-http-persistent (~> 4.0) + parallel (1.26.3) parallel_tests (2.14.2) parallel parser (2.7.2.0) ast (~> 2.4.1) - pastel (0.7.4) - equatable (~> 0.6) + pastel (0.8.0) tty-color (~> 0.5) pathspec (1.0.0) pluginator (1.5.0) @@ -217,7 +244,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - public_suffix (4.0.7) + public_suffix (5.1.1) puppet (7.0.0) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) @@ -231,15 +258,15 @@ GEM puppet-blacksmith (6.1.1) puppet-modulebuilder (~> 0.2) rest-client (~> 2.0) - puppet-debugger (1.2.0) + puppet-debugger (1.4.0) awesome_print (~> 1.7) bundler facterdb (>= 0.4.0) pluginator (~> 1.5.0) - puppet (>= 5.5) + puppet (>= 6) rb-readline (>= 0.5.5) table_print (>= 1.0.0) - tty-pager (~> 0.13.0) + tty-pager (~> 0.14) puppet-lint (2.5.2) puppet-module-posix-default-r2.7 (1.1.1) puppet-module-posix-dev-r2.7 (0.5.3) @@ -278,7 +305,7 @@ GEM puppet-modulebuilder (0.3.0) minitar (~> 0.9) pathspec (>= 0.2.1, < 2.0.0) - puppet-resource_api (1.8.14) + puppet-resource_api (1.9.0) hocon (>= 1.0) puppet-strings (2.9.0) rgen @@ -286,14 +313,13 @@ GEM puppet-syntax (2.6.1) puppet (>= 5) rake - puppet_forge (2.3.4) - faraday (>= 0.9.0, < 0.18.0, != 0.13.1) - faraday_middleware (>= 0.9.0, < 0.15.0) - gettext-setup (~> 0.11) + puppet_forge (3.2.0) + faraday (~> 1.3) + faraday_middleware (~> 1.0) minitar semantic_puppet (~> 1.0) - puppet_litmus (0.34.0) - bolt (>= 2.0.1, < 4.0.0) + puppet_litmus (0.36.2) + bolt (~> 3.0) docker-api (>= 1.34, < 3.0.0) honeycomb-beeline parallel @@ -304,7 +330,7 @@ GEM tty-spinner (>= 0.5.0, < 1.0.0) puppet_pot_generator (1.0.1) puppet - puppetfile-resolver (0.6.2) + puppetfile-resolver (0.6.3) molinillo (~> 0.6) semantic_puppet (~> 1.0) puppetlabs_spec_helper (2.16.0) @@ -313,20 +339,20 @@ GEM puppet-lint (~> 2.0) puppet-syntax (>= 2.0, < 4) rspec-puppet (~> 2.0) - r10k (3.15.0) + r10k (3.16.2) colored2 (= 3.1.2) cri (>= 2.15.10) fast_gettext (>= 1.1.0, < 3.0.0) gettext (>= 3.0.2, < 4.0.0) - gettext-setup (~> 0.24) - jwt (~> 2.2.3) + gettext-setup (>= 0.24, < 2.0.0) + jwt (>= 2.2.3, < 2.8.0) log4r (= 1.1.10) minitar (~> 0.9) multi_json (~> 1.10) - puppet_forge (>= 2.3.0) + puppet_forge (>= 2.3.0, < 4.0.0) rainbow (2.2.2) rake - rake (12.3.3) + rake (13.2.1) rb-readline (0.5.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -334,33 +360,34 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retryable (3.0.5) - rgen (0.9.0) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rexml (3.3.9) + rgen (0.9.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-its (1.3.0) + rspec-support (~> 3.13.0) + rspec-its (1.3.1) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.11.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.13.0) rspec-puppet (2.12.0) rspec rspec-puppet-facts (2.0.5) facter facterdb (>= 0.5.0) puppet - rspec-support (3.11.0) + rspec-support (3.13.1) rspec_honeycomb_formatter (0.2.1) honeycomb-beeline rspec-core (~> 3.0) - rspec_junit_formatter (0.5.1) + rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rsync (1.0.9) rubocop (0.49.1) @@ -374,15 +401,17 @@ GEM rubocop (~> 0.49.0) rubocop-rspec (1.16.0) rubocop (>= 0.49.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) ruby_smb (1.1.0) bindata rubyntlm windows_error - rubyntlm (0.6.3) + rubyntlm (0.6.5) + base64 rubyzip (2.3.2) semantic_puppet (1.0.4) - serverspec (2.42.0) + serverspec (2.42.3) multi_json rspec (~> 3.0) rspec-its @@ -395,7 +424,7 @@ GEM ansi hirb simplecov - simplecov-html (0.12.3) + simplecov-html (0.13.1) slop (3.6.0) spdx-licenses (1.3.0) specinfra (2.82.2) @@ -403,9 +432,9 @@ GEM net-ssh (>= 2.7) net-telnet (= 0.1.1) sfl - strings (0.1.8) - strings-ansi (~> 0.1) - unicode-display_width (~> 1.5) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) table_print (1.5.7) @@ -425,37 +454,33 @@ GEM winrm-elevated (~> 1.0) winrm-fs (~> 1.1) text (1.3.1) - thor (1.1.0) + thor (1.2.2) tomlrb (1.3.0) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) + tty-box (0.7.0) + pastel (~> 0.8) + strings (~> 0.2.0) tty-cursor (~> 0.7) tty-color (0.6.0) tty-cursor (0.7.1) - tty-pager (0.13.0) - strings (~> 0.1.8) + tty-pager (0.14.0) + strings (~> 0.2.0) tty-screen (~> 0.8) - tty-prompt (0.21.0) - necromancer (~> 0.5.0) - pastel (~> 0.7.0) - tty-reader (~> 0.7.0) - tty-reader (0.7.0) + tty-prompt (0.23.1) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) tty-cursor (~> 0.7) - tty-screen (~> 0.7) - wisper (~> 2.0.0) - tty-screen (0.8.1) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) unicode_utils (1.4.0) - webrick (1.7.0) - windows_error (0.1.4) + webrick (1.9.0) + windows_error (0.1.5) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -475,11 +500,10 @@ GEM rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) - xmlrpc (0.3.2) + xmlrpc (0.3.3) webrick - yard (0.9.28) - webrick (~> 1.7.0) - zeitwerk (2.6.0) + yard (0.9.37) + zeitwerk (2.6.18) PLATFORMS ruby @@ -506,4 +530,4 @@ DEPENDENCIES xmlrpc BUNDLED WITH - 1.17.3 + 2.1.4 From b1ce763cfe20a062d09121cd1ef5f4c4ed256674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 11:08:53 +0100 Subject: [PATCH 07/13] Try rvm install --- .circleci/config.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3806cc69..bcb4a8d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: | @@ -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 @@ -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 From 5bc403cd3e58cce08641af0c14bcfea85f5380a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 11:10:50 +0100 Subject: [PATCH 08/13] Revert Gemfile.lock --- Gemfile.lock | 342 ++++++++++++++++++++++++--------------------------- 1 file changed, 158 insertions(+), 184 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 432daf0f..49ac4af6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,34 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.7) - base64 - nkf - rexml - activesupport (6.1.7.10) + CFPropertyList (2.3.6) + activesupport (6.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) ansi (1.5.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.3.0) - aws-partitions (1.1001.0) - aws-sdk-core (3.212.0) - aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.992.0) - aws-sigv4 (~> 1.9) + aws-eventstream (1.2.0) + aws-partitions (1.609.0) + aws-sdk-core (3.131.3) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.525.0) + aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.487.0) - aws-sdk-core (~> 3, >= 3.210.0) - aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.1) + aws-sdk-ec2 (1.323.0) + aws-sdk-core (~> 3, >= 3.127.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) - base64 (0.2.0) - bcrypt_pbkdf (1.1.1) - bindata (2.5.0) - bolt (3.30.0) - CFPropertyList (>= 2.2) + bcrypt_pbkdf (1.1.0) + bindata (2.4.10) + bolt (3.24.0) + CFPropertyList (~> 2.2) addressable (~> 2.5) aws-sdk-ec2 (~> 1) concurrent-ruby (~> 1.0) @@ -41,80 +37,61 @@ GEM jwt (~> 2.2) logging (~> 2.2) minitar (~> 0.6) - net-scp (>= 1.2, < 5.0) - net-ssh (>= 4.0, < 8.0) + net-scp (~> 1.2) + net-ssh (>= 4.0, < 7.0) net-ssh-krb (~> 0.5) orchestrator_client (~> 0.5) puppet (>= 6.18.0) puppet-resource_api (>= 1.8.1) - puppet-strings (>= 2.3.0, < 5.0) - puppetfile-resolver (>= 0.6.2, < 1.0) + puppet-strings (~> 2.3) + puppetfile-resolver (~> 0.5) r10k (~> 3.10) ruby_smb (~> 1.0) terminal-table (~> 3.0) winrm (~> 2.0) winrm-fs (~> 1.3) - builder (3.3.0) + builder (3.2.4) codecov (0.2.5) colorize json simplecov coderay (1.1.3) colored2 (3.1.2) - colorize (1.1.0) + colorize (0.8.1) concurrent-ruby (1.1.10) - connection_pool (2.4.1) - cri (2.15.12) + connection_pool (2.2.5) + cri (2.15.11) deep_merge (1.2.2) - dependency_checker (0.3.0) + dependency_checker (0.2.0) parallel - puppet_forge (>= 2.2, < 4.0) - rake (~> 13.0) + puppet_forge (~> 2.2) + rake (~> 12.3) semantic_puppet (~> 1.0) - diff-lcs (1.5.1) - docile (1.4.1) - docker-api (2.4.0) - excon (>= 0.64.0) + diff-lcs (1.5.0) + docile (1.4.0) + docker-api (2.2.0) + excon (>= 0.47.0) multi_json - domain_name (0.6.20240107) - ed25519 (1.3.0) - erubi (1.13.0) - excon (1.1.1) - facter (4.10.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + ed25519 (1.2.4) + equatable (0.7.0) + erubi (1.10.0) + excon (0.92.4) + facter (4.2.10) hocon (~> 1.3) - thor (>= 1.0.1, < 1.3) - facterdb (1.27.0) + thor (>= 1.0.1, < 2.0) + facterdb (1.19.0) facter (< 5.0.0) - jgrep (~> 1.5, >= 1.5.4) - faraday (1.10.4) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.2) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.1) - faraday (~> 1.0) + jgrep + faraday (0.17.4) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.14.0) + faraday (>= 0.7.4, < 1.0) fast_gettext (1.1.2) - ffi (1.17.0) - ffi-compiler (1.3.2) - ffi (>= 1.15.5) + ffi (1.15.4) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) rake gettext (3.2.9) locale (>= 2.0.5) @@ -125,55 +102,55 @@ GEM locale gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.4.0) + gyoku (1.3.1) builder (>= 2.1.2) - rexml (~> 3.0) - hiera (3.12.0) - hiera-eyaml (3.4.0) + hiera (3.9.0) + hiera-eyaml (3.3.0) highline optimist - highline (2.1.0) + highline (2.0.3) hirb (0.7.3) - hocon (1.4.0) - honeycomb-beeline (3.1.0) - libhoney (>= 2.3.0) - http (5.2.0) - addressable (~> 2.8) - base64 (~> 0.1) + hocon (1.3.1) + honeycomb-beeline (2.11.0) + libhoney (>= 1.14.2) + http (4.4.1) + addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 2.2) - llhttp-ffi (~> 0.5.0) + http-parser (~> 1.2.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) + http-parser (1.2.3) + ffi-compiler (>= 1.0, < 2.0) httpclient (2.8.3) - i18n (1.14.6) + i18n (1.12.0) concurrent-ruby (~> 1.0) jgrep (1.5.4) - jmespath (1.6.2) - json (2.8.1) + jmespath (1.6.1) + json (2.6.2) json-schema (2.8.1) addressable (>= 2.4) - jwt (2.7.1) - kitchen-docker (3.0.0) + jwt (2.2.3) + kitchen-docker (2.11.0) test-kitchen (>= 1.0.0) - kitchen-puppet (3.7.0) + kitchen-puppet (3.5.2) librarian-puppet (>= 3.0) net-ssh (>= 3) test-kitchen (>= 1.4) - kitchen-verifier-serverspec (0.7.2) + kitchen-verifier-serverspec (0.7.1) net-ssh (>= 3) test-kitchen (>= 1.4) - libhoney (2.4.0) + libhoney (2.2.0) addressable (~> 2.0) excon http (>= 2.0, < 6.0) - librarian-puppet (4.0.1) + librarian-puppet (3.0.1) librarianp (>= 0.6.3) - puppet_forge (>= 2.1, < 4) + puppet_forge (~> 2.1) rsync - librarianp (1.1.2) + librarianp (1.1.1) thor (~> 1.0) license-acceptance (1.0.19) pastel (~> 0.7) @@ -181,13 +158,9 @@ GEM tty-box (~> 0.3) tty-prompt (~> 0.18) little-plugger (1.1.4) - llhttp-ffi (0.5.0) - ffi-compiler (~> 1.0) - rake (~> 13.0) - locale (2.1.4) + locale (2.1.3) log4r (1.1.10) - logger (1.6.1) - logging (2.4.0) + logging (2.3.0) little-plugger (~> 1.1) multi_json (~> 1.14) metaclass (0.0.4) @@ -195,13 +168,12 @@ GEM json-schema (~> 2.8) spdx-licenses (~> 1.0) method_source (0.8.2) - mime-types (3.6.0) - logger + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2024.1105) - minitar (0.12.1) - minitest (5.25.1) - mixlib-install (3.12.30) + mime-types-data (3.2022.0105) + minitar (0.9) + minitest (5.16.2) + mixlib-install (3.12.16) mixlib-shellout mixlib-versioning thor @@ -211,11 +183,12 @@ GEM metaclass (~> 0.0.1) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.4.1) - net-http-persistent (4.0.4) + multipart-post (2.1.1) + necromancer (0.5.1) + net-http-persistent (4.0.1) connection_pool (~> 2.2) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) + net-scp (1.2.1) + net-ssh (>= 2.6.5) net-ssh (6.1.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) @@ -224,18 +197,18 @@ GEM net-ssh (>= 2.0) net-telnet (0.1.1) netrc (0.11.0) - nkf (0.2.0) nori (2.6.0) - optimist (3.1.0) - orchestrator_client (0.7.0) - faraday (~> 1.4) - net-http-persistent (~> 4.0) - parallel (1.26.3) + optimist (3.0.1) + orchestrator_client (0.5.4) + faraday (~> 0.17.4) + net-http-persistent + parallel (1.20.1) parallel_tests (2.14.2) parallel parser (2.7.2.0) ast (~> 2.4.1) - pastel (0.8.0) + pastel (0.7.4) + equatable (~> 0.6) tty-color (~> 0.5) pathspec (1.0.0) pluginator (1.5.0) @@ -244,7 +217,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - public_suffix (5.1.1) + public_suffix (4.0.7) puppet (7.0.0) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) @@ -258,15 +231,15 @@ GEM puppet-blacksmith (6.1.1) puppet-modulebuilder (~> 0.2) rest-client (~> 2.0) - puppet-debugger (1.4.0) + puppet-debugger (1.2.0) awesome_print (~> 1.7) bundler facterdb (>= 0.4.0) pluginator (~> 1.5.0) - puppet (>= 6) + puppet (>= 5.5) rb-readline (>= 0.5.5) table_print (>= 1.0.0) - tty-pager (~> 0.14) + tty-pager (~> 0.13.0) puppet-lint (2.5.2) puppet-module-posix-default-r2.7 (1.1.1) puppet-module-posix-dev-r2.7 (0.5.3) @@ -305,7 +278,7 @@ GEM puppet-modulebuilder (0.3.0) minitar (~> 0.9) pathspec (>= 0.2.1, < 2.0.0) - puppet-resource_api (1.9.0) + puppet-resource_api (1.8.14) hocon (>= 1.0) puppet-strings (2.9.0) rgen @@ -313,13 +286,14 @@ GEM puppet-syntax (2.6.1) puppet (>= 5) rake - puppet_forge (3.2.0) - faraday (~> 1.3) - faraday_middleware (~> 1.0) + puppet_forge (2.3.4) + faraday (>= 0.9.0, < 0.18.0, != 0.13.1) + faraday_middleware (>= 0.9.0, < 0.15.0) + gettext-setup (~> 0.11) minitar semantic_puppet (~> 1.0) - puppet_litmus (0.36.2) - bolt (~> 3.0) + puppet_litmus (0.34.0) + bolt (>= 2.0.1, < 4.0.0) docker-api (>= 1.34, < 3.0.0) honeycomb-beeline parallel @@ -330,7 +304,7 @@ GEM tty-spinner (>= 0.5.0, < 1.0.0) puppet_pot_generator (1.0.1) puppet - puppetfile-resolver (0.6.3) + puppetfile-resolver (0.6.2) molinillo (~> 0.6) semantic_puppet (~> 1.0) puppetlabs_spec_helper (2.16.0) @@ -339,20 +313,20 @@ GEM puppet-lint (~> 2.0) puppet-syntax (>= 2.0, < 4) rspec-puppet (~> 2.0) - r10k (3.16.2) + r10k (3.15.0) colored2 (= 3.1.2) cri (>= 2.15.10) fast_gettext (>= 1.1.0, < 3.0.0) gettext (>= 3.0.2, < 4.0.0) - gettext-setup (>= 0.24, < 2.0.0) - jwt (>= 2.2.3, < 2.8.0) + gettext-setup (~> 0.24) + jwt (~> 2.2.3) log4r (= 1.1.10) minitar (~> 0.9) multi_json (~> 1.10) - puppet_forge (>= 2.3.0, < 4.0.0) + puppet_forge (>= 2.3.0) rainbow (2.2.2) rake - rake (13.2.1) + rake (12.3.3) rb-readline (0.5.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -360,34 +334,33 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retryable (3.0.5) - rexml (3.3.9) - rgen (0.9.1) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.2) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) + rgen (0.9.0) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-its (1.3.1) + rspec-support (~> 3.11.0) + rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.13.2) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) + rspec-support (~> 3.11.0) rspec-puppet (2.12.0) rspec rspec-puppet-facts (2.0.5) facter facterdb (>= 0.5.0) puppet - rspec-support (3.13.1) + rspec-support (3.11.0) rspec_honeycomb_formatter (0.2.1) honeycomb-beeline rspec-core (~> 3.0) - rspec_junit_formatter (0.6.0) + rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) rsync (1.0.9) rubocop (0.49.1) @@ -401,17 +374,15 @@ GEM rubocop (~> 0.49.0) rubocop-rspec (1.16.0) rubocop (>= 0.49.0) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) + ruby-progressbar (1.11.0) ruby_smb (1.1.0) bindata rubyntlm windows_error - rubyntlm (0.6.5) - base64 + rubyntlm (0.6.3) rubyzip (2.3.2) semantic_puppet (1.0.4) - serverspec (2.42.3) + serverspec (2.42.0) multi_json rspec (~> 3.0) rspec-its @@ -424,7 +395,7 @@ GEM ansi hirb simplecov - simplecov-html (0.13.1) + simplecov-html (0.12.3) slop (3.6.0) spdx-licenses (1.3.0) specinfra (2.82.2) @@ -432,9 +403,9 @@ GEM net-ssh (>= 2.7) net-telnet (= 0.1.1) sfl - strings (0.2.1) - strings-ansi (~> 0.2) - unicode-display_width (>= 1.5, < 3.0) + strings (0.1.8) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) unicode_utils (~> 1.4) strings-ansi (0.2.0) table_print (1.5.7) @@ -454,33 +425,37 @@ GEM winrm-elevated (~> 1.0) winrm-fs (~> 1.1) text (1.3.1) - thor (1.2.2) + thor (1.1.0) tomlrb (1.3.0) - tty-box (0.7.0) - pastel (~> 0.8) - strings (~> 0.2.0) + tty-box (0.5.0) + pastel (~> 0.7.2) + strings (~> 0.1.6) tty-cursor (~> 0.7) tty-color (0.6.0) tty-cursor (0.7.1) - tty-pager (0.14.0) - strings (~> 0.2.0) + tty-pager (0.13.0) + strings (~> 0.1.8) tty-screen (~> 0.8) - tty-prompt (0.23.1) - pastel (~> 0.8) - tty-reader (~> 0.8) - tty-reader (0.9.0) + tty-prompt (0.21.0) + necromancer (~> 0.5.0) + pastel (~> 0.7.0) + tty-reader (~> 0.7.0) + tty-reader (0.7.0) tty-cursor (~> 0.7) - tty-screen (~> 0.8) - wisper (~> 2.0) - tty-screen (0.8.2) + tty-screen (~> 0.7) + wisper (~> 2.0.0) + tty-screen (0.8.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) - tzinfo (2.0.6) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (1.7.0) unicode_utils (1.4.0) - webrick (1.9.0) - windows_error (0.1.5) + webrick (1.7.0) + windows_error (0.1.4) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -500,21 +475,21 @@ GEM rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) - xmlrpc (0.3.3) + xmlrpc (0.3.2) webrick - yard (0.9.37) - zeitwerk (2.6.18) + yard (0.9.28) + webrick (~> 1.7.0) + zeitwerk (2.6.0) PLATFORMS ruby DEPENDENCIES - concurrent-ruby (= 1.1.10) fast_gettext kitchen-docker kitchen-puppet kitchen-verifier-serverspec - librarian-puppet (<= 4.0.1) + librarian-puppet mixlib-shellout (~> 2.2.7) puppet (~> 7.0.0) puppet-module-posix-default-r2.7 @@ -525,9 +500,8 @@ 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 BUNDLED WITH - 2.1.4 + 1.17.3 From e06d939c45b8334865fd2b12a24c95b4d4a7bf29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 11:13:32 +0100 Subject: [PATCH 09/13] Use latest image - no rvm --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bcb4a8d7..9f4280c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ orbs: jobs: specs-ruby21-puppet46: &specs machine: - image: ubuntu-2004:2023.02.1 + image: ubuntu-2004:2024.08.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.1.9' @@ -295,7 +295,7 @@ jobs: verify-gemfile-lock-dependencies: machine: - image: ubuntu-2004:2023.02.1 + image: ubuntu-2004:2024.08.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.5.3' @@ -325,7 +325,7 @@ jobs: kitchen-tests: machine: - image: ubuntu-2004:2023.02.1 + image: ubuntu-2004:2024.08.1 environment: STRICT_VARIABLES: 'yes' RUBY_VERSION: '2.5.3' From 07a07d8dfa1bcea05b14ca2a465d7732f3e7ad7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 11:51:04 +0100 Subject: [PATCH 10/13] Pin ffi version --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 638ca919..9545b432 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ ruby_version_segments = ruby_version.segments minor_version = ruby_version_segments[0..1].join('.') group :development do + gem "ffi", "= 1.16.3" # https://github.com/ffi/ffi/issues/1103 gem "rake", "~> 12.3.3" if ruby_version < Gem::Version.new('2.6.0') # last version for ruby < 2.6 gem "semantic_puppet", '= 1.0.4' gem "xmlrpc" if ruby_version >= Gem::Version.new('2.3') From 3a5dc1983eb2a4ce13fbd5098369c420abe7cc44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 11:58:39 +0100 Subject: [PATCH 11/13] Pin ffi version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9545b432..a710ae1c 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ ruby_version_segments = ruby_version.segments minor_version = ruby_version_segments[0..1].join('.') group :development do - gem "ffi", "= 1.16.3" # https://github.com/ffi/ffi/issues/1103 + gem "ffi", "= 1.16.3" if ruby_version >= Gem::Version.new('2.5') # 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) gem "rake", "~> 12.3.3" if ruby_version < Gem::Version.new('2.6.0') # last version for ruby < 2.6 gem "semantic_puppet", '= 1.0.4' gem "xmlrpc" if ruby_version >= Gem::Version.new('2.3') From c1dee99a3017219f7542a09b8d1e8ea9e5472230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 13:36:29 +0100 Subject: [PATCH 12/13] Do not pin ffi on windows + bundle update ffi --- Gemfile | 8 +++++++- Gemfile.lock | 7 +++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a710ae1c..d803173f 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,6 @@ ruby_version_segments = ruby_version.segments minor_version = ruby_version_segments[0..1].join('.') group :development do - gem "ffi", "= 1.16.3" if ruby_version >= Gem::Version.new('2.5') # 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) gem "rake", "~> 12.3.3" if ruby_version < Gem::Version.new('2.6.0') # last version for ruby < 2.6 gem "semantic_puppet", '= 1.0.4' gem "xmlrpc" if ruby_version >= Gem::Version.new('2.3') @@ -33,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 index 49ac4af6..07fddbc5 100644 --- 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 From 8c8b0ec5bc2cf48b2ce28592f480fa5c34e379d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Bavelier?= Date: Thu, 7 Nov 2024 14:36:40 +0100 Subject: [PATCH 13/13] Fix OpenSUSE kitchen test --- kitchen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/kitchen.yml b/kitchen.yml index c3de5b20..86ce2168 100644 --- 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