diff --git a/.fixtures.yml b/.fixtures.yml index 10326c0..09e8d01 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -10,7 +10,6 @@ fixtures: repo: puppetlabs/inifile firewall: repo: puppetlabs/firewall - ref: '6.0.0' yumrepo_core: repo: puppetlabs/yumrepo_core python: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fbed3d7..1a10248 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,7 +48,6 @@ jobs: fail-fast: false matrix: set: - - "el7" - "el8" - "debian-11" - "ubuntu-2004" diff --git a/metadata.json b/metadata.json index 5c4e4ad..717d802 100644 --- a/metadata.json +++ b/metadata.json @@ -22,11 +22,11 @@ }, { "name": "puppetlabs/firewall", - "version_requirement": ">= 3.6.0 <7.0.0" + "version_requirement": ">= 3.6.0 <9.0.0" }, { "name": "puppet/epel", - "version_requirement": ">= 3.0.0 <5.0.0" + "version_requirement": ">= 3.0.0 <6.0.0" }, { "name": "puppet/python", diff --git a/spec/acceptance/nodesets/el7.yml b/spec/acceptance/nodesets/el7.yml deleted file mode 100644 index 7afe4a4..0000000 --- a/spec/acceptance/nodesets/el7.yml +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - centos-7: - roles: - - agent - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: - - '/usr/sbin/init' - docker_image_commands: - - 'yum install -y wget which cronie iproute initscripts' - - 'wget --no-check-certificate https://copr.fedorainfracloud.org/coprs/jsynacek/systemd-backports-for-centos-7/repo/epel-7/jsynacek-systemd-backports-for-centos-7-epel-7.repo -O /etc/yum.repos.d/jsynacek-systemd-centos-7.repo' - - 'yum update -y systemd' - - 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment' - - 'echo "LANG=en_US.UTF-8" > /etc/locale.conf' - docker_env: - - LANG=en_US.UTF-8 - - LANGUAGE=en_US.UTF-8 - - LC_ALL=en_US.UTF-8 - docker_container_name: 'globus-el7' -CONFIG: - log_level: debug - type: foss -ssh: - password: root - auth_methods: ["password"] - diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb index 78f629d..1d619ff 100644 --- a/spec/spec_helper_local.rb +++ b/spec/spec_helper_local.rb @@ -5,11 +5,6 @@ def platforms { - 'RedHat-7' => { - python_version: '3', - pip_provider: 'pip3', - venv_python_version: '3.6' - }, 'RedHat-8' => { python_version: '3', pip_provider: 'pip3',