diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index fd2a485d..08f5283d 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -35,11 +35,11 @@ jobs: - name: Checkout Source uses: actions/checkout@v4 if: ${{ github.repository_owner == 'puppetlabs' }} - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 if: ${{ github.repository_owner == 'puppetlabs' }} with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml index 432bd65d..bbfbd557 100644 --- a/.github/workflows/test-add-compiler-matrix.yml +++ b/.github/workflows/test-add-compiler-matrix.yml @@ -41,10 +41,10 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml index dfcacbf3..0abbe94a 100644 --- a/.github/workflows/test-add-compiler.yaml +++ b/.github/workflows/test-add-compiler.yaml @@ -42,10 +42,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml index 796fb204..d6a9eca6 100644 --- a/.github/workflows/test-add-replica-matrix.yaml +++ b/.github/workflows/test-add-replica-matrix.yaml @@ -41,10 +41,10 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml index cd2343ea..6b435559 100644 --- a/.github/workflows/test-add-replica.yaml +++ b/.github/workflows/test-add-replica.yaml @@ -42,10 +42,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-backup-restore-migration.yaml b/.github/workflows/test-backup-restore-migration.yaml index 9f3fa843..e0c77497 100644 --- a/.github/workflows/test-backup-restore-migration.yaml +++ b/.github/workflows/test-backup-restore-migration.yaml @@ -37,10 +37,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} @@ -146,10 +146,10 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-backup-restore.yaml b/.github/workflows/test-backup-restore.yaml index 61662c3c..1a08572e 100644 --- a/.github/workflows/test-backup-restore.yaml +++ b/.github/workflows/test-backup-restore.yaml @@ -47,10 +47,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml index cf1d777f..e64d7f8f 100644 --- a/.github/workflows/test-failover.yaml +++ b/.github/workflows/test-failover.yaml @@ -46,10 +46,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-fips-install-matrix.yaml b/.github/workflows/test-fips-install-matrix.yaml index 7b0ea60b..1c6b1763 100644 --- a/.github/workflows/test-fips-install-matrix.yaml +++ b/.github/workflows/test-fips-install-matrix.yaml @@ -43,10 +43,10 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-install-latest-dev.yaml b/.github/workflows/test-install-latest-dev.yaml index b646fcc2..99435619 100644 --- a/.github/workflows/test-install-latest-dev.yaml +++ b/.github/workflows/test-install-latest-dev.yaml @@ -45,10 +45,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml index 64064918..180e67d3 100644 --- a/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml +++ b/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml @@ -31,10 +31,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml index ad9fa737..62e44fc6 100644 --- a/.github/workflows/test-install-matrix.yaml +++ b/.github/workflows/test-install-matrix.yaml @@ -41,10 +41,10 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-install-rhel-9.yaml b/.github/workflows/test-install-rhel-9.yaml index a78418ea..7591d77d 100644 --- a/.github/workflows/test-install-rhel-9.yaml +++ b/.github/workflows/test-install-rhel-9.yaml @@ -41,10 +41,10 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml index 8aa4ed5c..b4e7bc98 100644 --- a/.github/workflows/test-install.yaml +++ b/.github/workflows/test-install.yaml @@ -42,10 +42,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-legacy-compilers.yaml b/.github/workflows/test-legacy-compilers.yaml index 8d0d87fe..c6885e9b 100644 --- a/.github/workflows/test-legacy-compilers.yaml +++ b/.github/workflows/test-legacy-compilers.yaml @@ -46,10 +46,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-legacy-upgrade.yaml b/.github/workflows/test-legacy-upgrade.yaml index 5fc1a828..3c82dfac 100644 --- a/.github/workflows/test-legacy-upgrade.yaml +++ b/.github/workflows/test-legacy-upgrade.yaml @@ -46,10 +46,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml index 93bf46e5..2ccc3593 100644 --- a/.github/workflows/test-migration.yaml +++ b/.github/workflows/test-migration.yaml @@ -73,10 +73,10 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-replace-failed-postgresql.yaml b/.github/workflows/test-replace-failed-postgresql.yaml index ea2fdb50..ee91e852 100644 --- a/.github/workflows/test-replace-failed-postgresql.yaml +++ b/.github/workflows/test-replace-failed-postgresql.yaml @@ -44,10 +44,10 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml index 142f444f..22bc45c3 100644 --- a/.github/workflows/test-upgrade-latest-dev.yaml +++ b/.github/workflows/test-upgrade-latest-dev.yaml @@ -52,10 +52,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml index bc97edd4..8527a54b 100644 --- a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml +++ b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml @@ -21,10 +21,10 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml index c9032746..589774f9 100644 --- a/.github/workflows/test-upgrade-matrix.yaml +++ b/.github/workflows/test-upgrade-matrix.yaml @@ -59,10 +59,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml index 8ddb3e2d..d1e56723 100644 --- a/.github/workflows/test-upgrade.yaml +++ b/.github/workflows/test-upgrade.yaml @@ -56,10 +56,10 @@ jobs: SSH_PASS: ${{ secrets.SSH_PASS }} - name: Checkout Source uses: actions/checkout@v4 - - name: Activate Ruby 2.7 + - name: Activate Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' bundler-cache: true - name: Print bundle environment if: ${{ github.repository_owner == 'puppetlabs' }} diff --git a/.ruby-version b/.ruby-version index 6a81b4c8..fd2a0186 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.1.0 diff --git a/Gemfile b/Gemfile index 38a26f68..c277dce8 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ group :development do gem "orchestrator_client", '< 0.7.1', require: false end group :system_tests do - gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] + gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] gem "serverspec", '~> 2.41', require: false end group :release_prep do diff --git a/metadata.json b/metadata.json index 9759e71d..df11b8af 100644 --- a/metadata.json +++ b/metadata.json @@ -83,7 +83,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 7.0.0 < 9.0.0" + "version_requirement": ">= 8.0.0 < 9.0.0" } ], "pdk-version": "3.0.0",