From 0d6cee41db0009c0f09db83f80a87874adafccd9 Mon Sep 17 00:00:00 2001
From: David Mallon <david.mallon@perforce.com>
Date: Mon, 12 May 2025 15:43:02 +0100
Subject: [PATCH] (PE-41319) Fix acceptance tests by upgrading litmus and ruby
 versions

---
 .github/workflows/spec.yml                                | 4 ++--
 .github/workflows/test-add-compiler-matrix.yml            | 4 ++--
 .github/workflows/test-add-compiler.yaml                  | 4 ++--
 .github/workflows/test-add-replica-matrix.yaml            | 4 ++--
 .github/workflows/test-add-replica.yaml                   | 4 ++--
 .github/workflows/test-backup-restore-migration.yaml      | 8 ++++----
 .github/workflows/test-backup-restore.yaml                | 4 ++--
 .github/workflows/test-failover.yaml                      | 4 ++--
 .github/workflows/test-fips-install-matrix.yaml           | 4 ++--
 .github/workflows/test-install-latest-dev.yaml            | 4 ++--
 .../workflows/test-install-latest-xlarge-dev-nightly.yaml | 4 ++--
 .github/workflows/test-install-matrix.yaml                | 4 ++--
 .github/workflows/test-install-rhel-9.yaml                | 4 ++--
 .github/workflows/test-install.yaml                       | 4 ++--
 .github/workflows/test-legacy-compilers.yaml              | 4 ++--
 .github/workflows/test-legacy-upgrade.yaml                | 4 ++--
 .github/workflows/test-migration.yaml                     | 4 ++--
 .github/workflows/test-replace-failed-postgresql.yaml     | 4 ++--
 .github/workflows/test-upgrade-latest-dev.yaml            | 4 ++--
 .../workflows/test-upgrade-latest-xlarge-dev-nightly.yaml | 4 ++--
 .github/workflows/test-upgrade-matrix.yaml                | 4 ++--
 .github/workflows/test-upgrade.yaml                       | 4 ++--
 .ruby-version                                             | 2 +-
 Gemfile                                                   | 2 +-
 metadata.json                                             | 2 +-
 25 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index fd2a485d6..08f5283d0 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 432bd65d3..bbfbd557f 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 dfcacbf30..0abbe94a6 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 796fb2045..d6a9eca66 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 cd2343ea7..6b435559e 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 9f3fa843f..e0c774977 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 61662c3ce..1a08572e7 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 cf1d777fc..e64d7f8f5 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 7b0ea60b3..1c6b17630 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 b646fcc2e..994356196 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 640649188..180e67d3a 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 ad9fa7373..62e44fc6e 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 a78418ea8..7591d77dc 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 8aa4ed5c7..b4e7bc98f 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 8d0d87fe3..c6885e9b6 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 5fc1a8283..3c82dfac6 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 93bf46e5b..2ccc35934 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 ea2fdb509..ee91e8522 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 142f444f0..22bc45c37 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 bc97edd41..8527a54b9 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 c9032746c..589774f9a 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 8ddb3e2da..d1e567234 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 6a81b4c83..fd2a01863 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.8
+3.1.0
diff --git a/Gemfile b/Gemfile
index 38a26f685..c277dce83 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 9759e71dc..df11b8af7 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",