diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6d32a79..c7e58ec 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,11 +18,11 @@ jobs: fail-fast: false matrix: include: - - ruby: 2.7.7 + - ruby: 2.7.8 puppet: 7 fixtures: .fixtures.yml allow_failure: false - - ruby: 3.2.2 + - ruby: 3.2.3 puppet: 8 fixtures: .fixtures.yml allow_failure: false @@ -50,7 +50,6 @@ jobs: fail-fast: false matrix: set: - - "el7" - "el8" - "el9" - "amazon2023" diff --git a/.sync.yml b/.sync.yml index a9b4c8b..5c815ae 100644 --- a/.sync.yml +++ b/.sync.yml @@ -7,7 +7,7 @@ Rakefile: - '0 6 * * 1' acceptance_matrix: set: - - el7 + - ---el7 - el8 - el9 - amazon2023 @@ -22,9 +22,7 @@ Rakefile: appveyor.yml: delete: true spec/acceptance/nodesets/el7.yml: - default_module_install_opts: - ignore-dependencies: ~ - force: ~ + delete: true spec/acceptance/nodesets/el8.yml: default_module_install_opts: ignore-dependencies: ~ diff --git a/data/os/RedHat/7.yaml b/data/os/RedHat/7.yaml deleted file mode 100644 index f3e841f..0000000 --- a/data/os/RedHat/7.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# OnDemand 3.1 does not support EL7 -openondemand::repo_release: '3.0' -openondemand::repo_gpgkey: https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand diff --git a/metadata.json b/metadata.json index 51b4524..bec65cf 100644 --- a/metadata.json +++ b/metadata.json @@ -46,12 +46,6 @@ } ], "operatingsystem_support": [ - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7" - ] - }, { "operatingsystem": "Rocky", "operatingsystemrelease": [ @@ -69,7 +63,6 @@ { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "7", "8", "9" ] @@ -107,5 +100,5 @@ ], "pdk-version": "2.7.1", "template-url": "https://github.com/treydock/pdk-templates.git#master", - "template-ref": "heads/master-0-g5a59870" + "template-ref": "heads/master-0-g50afcd2" } diff --git a/spec/acceptance/nodesets/el7.yml b/spec/acceptance/nodesets/el7.yml deleted file mode 100644 index 3a29316..0000000 --- a/spec/acceptance/nodesets/el7.yml +++ /dev/null @@ -1,29 +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' - docker_env: - - LANG=en_US.UTF-8 - - LANGUAGE=en_US.UTF-8 - - LC_ALL=en_US.UTF-8 - docker_container_name: 'openondemand-el7' - default_module_install_opts: - ignore-dependencies: - force: -CONFIG: - log_level: debug - type: foss -ssh: - password: root - auth_methods: ["password"] - diff --git a/spec/acceptance/nodesets/el8.yml b/spec/acceptance/nodesets/el8.yml index 0c6dfa0..9d5de5c 100644 --- a/spec/acceptance/nodesets/el8.yml +++ b/spec/acceptance/nodesets/el8.yml @@ -1,10 +1,10 @@ HOSTS: - rocky-8: + el8: roles: - agent platform: el-8-x86_64 hypervisor: docker - image: almalinux:8 + image: rockylinux:8 docker_preserve_image: true docker_cmd: - '/usr/sbin/init' diff --git a/spec/acceptance/nodesets/el9.yml b/spec/acceptance/nodesets/el9.yml index 59be382..8d35ebe 100644 --- a/spec/acceptance/nodesets/el9.yml +++ b/spec/acceptance/nodesets/el9.yml @@ -1,10 +1,10 @@ HOSTS: - almalinux-9: + el9: roles: - agent platform: el-9-x86_64 hypervisor: docker - image: almalinux:9 + image: rockylinux:9 docker_preserve_image: true docker_cmd: - '/usr/sbin/init'