From d4edb547e9e2dda43bb9cb01fd2ceb98846cf5b2 Mon Sep 17 00:00:00 2001 From: Dan Gibbs Date: Sun, 21 Jan 2024 13:43:03 +0000 Subject: [PATCH] Add Puppet 8 support. Drop near EOL Linux version support. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 2 +- metadata.json | 20 ++++---------------- provision.yaml | 2 -- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f23b35..b699bd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Setup ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7.3' + ruby-version: '3.2' bundler-cache: true - name: Run static validations @@ -66,7 +66,7 @@ jobs: - name: Setup ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7.3' + ruby-version: '3.2' bundler-cache: true - name: Provision Testing Environments diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68a03f2..b1143c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.2' bundler-cache: true - name: Build and Deploy diff --git a/metadata.json b/metadata.json index fba455e..3ca046c 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.13.1 < 9.0.0" + "version_requirement": ">= 4.13.1 < 10.0.0" } ], "operatingsystem_support": [ @@ -20,23 +20,17 @@ "8" ] }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "8" - ] - }, { "operatingsystem": "Debian", "operatingsystemrelease": [ + "12", "11" ] }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "8", - "7" + "8" ] }, { @@ -45,12 +39,6 @@ "8" ] }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "7" - ] - }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ @@ -62,7 +50,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.21.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 8.0.0" } ], "tags": [ diff --git a/provision.yaml b/provision.yaml index b3369c9..aa860f1 100644 --- a/provision.yaml +++ b/provision.yaml @@ -3,9 +3,7 @@ default: provisioner: docker images: - 'litmusimage/almalinux:8' - - 'litmusimage/centos:8' - 'litmusimage/debian:11' - 'litmusimage/rockylinux:8' - - 'litmusimage/scientificlinux:7' - 'litmusimage/ubuntu:22.04' - 'litmusimage/ubuntu:20.04'