From b0f0ee418631ee5826c4143fa0fdf6e6b29c8fab Mon Sep 17 00:00:00 2001 From: treydock Date: Sat, 15 Jul 2023 12:04:39 -0400 Subject: [PATCH] Drop Puppet 6, add Puppet 8 support, drop Ubuntu 18.04 (#298) * Drop Puppet 6, add Puppet 8 support * Drop Ubuntu 18.04 support --- .github/workflows/ci.yaml | 28 +++++++++++------------- .github/workflows/release.yaml | 2 +- .sync.yml | 18 ++++++--------- metadata.json | 7 +++--- spec/acceptance/nodesets/ubuntu-1804.yml | 25 --------------------- spec/spec_helper.rb | 2 +- 6 files changed, 25 insertions(+), 57 deletions(-) delete mode 100644 spec/acceptance/nodesets/ubuntu-1804.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3461100b..761d0feb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,30 +16,29 @@ jobs: fail-fast: false matrix: include: - - ruby: 2.5.9 - puppet: 6 + - ruby: 2.7.7 + puppet: 7 fixtures: .fixtures.yml allow_failure: false - - ruby: 2.7.6 - puppet: 7 + - ruby: 3.2.2 + puppet: 8 fixtures: .fixtures.yml allow_failure: false - - ruby: 2.5.9 - puppet: 6 - fixtures: .fixtures-latest.yml - allow_failure: true - ruby: 2.7.6 puppet: 7 fixtures: .fixtures-latest.yml allow_failure: true + - ruby: 3.2.2 + puppet: 8 + fixtures: .fixtures-latest.yml + allow_failure: true env: BUNDLE_WITHOUT: system_tests:release PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}.0" - FACTER_GEM_VERSION: "< 4.0" FIXTURES_YML: ${{ matrix.fixtures }} name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }}) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup ruby uses: ruby/setup-ruby@v1 with: @@ -62,23 +61,22 @@ jobs: - "el9" - "debian-10" - "debian-11" - - "ubuntu-1804" - "ubuntu-2004" - "ubuntu-2204" puppet: - - "puppet6" - "puppet7" + - "puppet8" keycloak_version: - "21.0.1" keycloak_full: - "no" include: - set: "el8" - puppet: "puppet6" + puppet: "puppet7" keycloak_version: "21.0.1" keycloak_full: "yes" - set: "el8" - puppet: "puppet7" + puppet: "puppet8" keycloak_version: "21.0.1" keycloak_full: "yes" env: @@ -98,7 +96,7 @@ jobs: sudo apt-get update sudo apt-get install apparmor-profiles sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 495a7154..f55e6af8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.sync.yml b/.sync.yml index 50f0c930..8b8289ea 100644 --- a/.sync.yml +++ b/.sync.yml @@ -4,12 +4,12 @@ Rakefile: .github/workflows/ci.yaml: unit_name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }}) unit_includes: - - ruby: '2.5.9' - puppet: '6' + - ruby: '2.7.7' + puppet: '7' fixtures: .fixtures-latest.yml allow_failure: true - - ruby: '2.7.6' - puppet: '7' + - ruby: '3.2.2' + puppet: '8' fixtures: .fixtures-latest.yml allow_failure: true acceptance_name: '${{ matrix.puppet }} ${{ matrix.set }} (keycloak=${{ matrix.keycloak_version }} full=${{ matrix.keycloak_full }})' @@ -20,22 +20,21 @@ Rakefile: - el9 - debian-10 - debian-11 - - ubuntu-1804 - ubuntu-2004 - ubuntu-2204 puppet: - - puppet6 - puppet7 + - puppet8 keycloak_version: - '21.0.1' keycloak_full: ['no'] acceptance_includes: - set: el8 - puppet: puppet6 + puppet: puppet7 keycloak_version: 21.0.1 keycloak_full: 'yes' - set: el8 - puppet: puppet7 + puppet: puppet8 keycloak_version: 21.0.1 keycloak_full: 'yes' .gitignore: @@ -60,9 +59,6 @@ spec/acceptance/nodesets/debian-10.yml: spec/acceptance/nodesets/debian-11.yml: packages: - iproute2 -spec/acceptance/nodesets/ubuntu-1804.yml: - packages: - - iproute2 spec/acceptance/nodesets/ubuntu-2004.yml: packages: - iproute2 diff --git a/metadata.json b/metadata.json index 05e27d5f..8188ff8e 100644 --- a/metadata.json +++ b/metadata.json @@ -76,7 +76,6 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "18.04", "20.04", "22.04" ] @@ -85,10 +84,10 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.0.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 9.0.0" } ], - "pdk-version": "2.1.0", + "pdk-version": "2.7.1", "template-url": "https://github.com/treydock/pdk-templates.git#master", - "template-ref": "heads/master-0-gbfcd6dd" + "template-ref": "heads/master-0-g70732db" } diff --git a/spec/acceptance/nodesets/ubuntu-1804.yml b/spec/acceptance/nodesets/ubuntu-1804.yml deleted file mode 100644 index f16a93b0..00000000 --- a/spec/acceptance/nodesets/ubuntu-1804.yml +++ /dev/null @@ -1,25 +0,0 @@ -HOSTS: - ubuntu1804: - roles: - - agent - platform: ubuntu-18.04-amd64 - hypervisor : docker - image: ubuntu:18.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - "rm -f /etc/dpkg/dpkg.cfg.d/excludes" - - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates lsb-release' - - 'locale-gen en_US.UTF-8' - docker_env: - - LANG=en_US.UTF-8 - - LANGUAGE=en_US.UTF-8 - - LC_ALL=en_US.UTF-8 - docker_container_name: 'keycloak-ubuntu1804' -CONFIG: - log_level: debug - type: foss -ssh: - password: root - auth_methods: ["password"] - diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 036b5f84..7272754c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -25,7 +25,7 @@ next unless File.exist?(f) && File.readable?(f) && File.size?(f) begin - default_facts.merge!(YAML.safe_load(File.read(f), [], [], true)) + default_facts.merge!(YAML.safe_load(File.read(f))) rescue StandardError => e RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" end