diff --git a/.fixtures.yml b/.fixtures.yml index 7cfde05a..636327a0 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -11,7 +11,7 @@ fixtures: ref: v6.6.0 java: repo: https://github.com/puppetlabs/puppetlabs-java.git - ref: v6.3.0 + ref: v7.3.0 java_ks: repo: https://github.com/puppetlabs/puppetlabs-java_ks.git ref: 1.4.1 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 11c9aac2..73f5afd3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -56,7 +56,7 @@ jobs: matrix: set: - "centos-7" - - "centos-8" + - "rocky-8" - "debian-9" - "debian-10" - "ubuntu-1804" diff --git a/.sync.yml b/.sync.yml index 219b3ec1..e5d5df48 100644 --- a/.sync.yml +++ b/.sync.yml @@ -14,7 +14,7 @@ acceptance_matrix: set: - centos-7 - - centos-8 + - rocky-8 - debian-9 - debian-10 - ubuntu-1804 @@ -74,17 +74,9 @@ delete: true appveyor.yml: delete: true -spec/acceptance/nodesets/centos-6.yml: - delete: true -spec/acceptance/nodesets/debian-8.yml: - delete: true spec/acceptance/nodesets/debian-10.yml: packages: - iproute2 -spec/acceptance/nodesets/ubuntu-1404.yml: - delete: true -spec/acceptance/nodesets/ubuntu-1604.yml: - delete: true spec/acceptance/nodesets/ubuntu-1804.yml: packages: - iproute2 diff --git a/metadata.json b/metadata.json index f1cc7722..4426844d 100644 --- a/metadata.json +++ b/metadata.json @@ -22,7 +22,7 @@ }, { "name": "puppetlabs/java", - "version_requirement": ">= 6.3.0 <8.0.0" + "version_requirement": ">= 7.3.0 <8.0.0" }, { "name": "puppetlabs/java_ks", @@ -56,7 +56,12 @@ { "operatingsystem": "CentOS", "operatingsystemrelease": [ - "7", + "7" + ] + }, + { + "operatingsystem": "Rocky", + "operatingsystemrelease": [ "8" ] }, @@ -83,5 +88,5 @@ ], "pdk-version": "1.17.0", "template-url": "https://github.com/treydock/pdk-templates.git#master", - "template-ref": "heads/master-0-g4e040ab" + "template-ref": "heads/master-0-g3b13f94" } diff --git a/spec/acceptance/nodesets/centos-8.yml b/spec/acceptance/nodesets/rocky-8.yml similarity index 92% rename from spec/acceptance/nodesets/centos-8.yml rename to spec/acceptance/nodesets/rocky-8.yml index 41e74e94..2ef1a1b3 100644 --- a/spec/acceptance/nodesets/centos-8.yml +++ b/spec/acceptance/nodesets/rocky-8.yml @@ -1,10 +1,10 @@ HOSTS: - centos-8: + rocky-8: roles: - agent platform: el-8-x86_64 hypervisor: docker - image: centos:8 + image: rockylinux/rockylinux:8 docker_preserve_image: true docker_cmd: - '/usr/sbin/init' diff --git a/spec/acceptance/nodesets/ubuntu-1804.yml b/spec/acceptance/nodesets/ubuntu-1804.yml index 7e42ee99..898348b0 100644 --- a/spec/acceptance/nodesets/ubuntu-1804.yml +++ b/spec/acceptance/nodesets/ubuntu-1804.yml @@ -9,7 +9,7 @@ HOSTS: docker_cmd: '["/sbin/init"]' docker_image_commands: - "rm -f /etc/dpkg/dpkg.cfg.d/excludes" - - 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates iproute2' + - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates' - 'locale-gen en_US.UTF-8' docker_env: - LANG=en_US.UTF-8 diff --git a/spec/acceptance/nodesets/ubuntu-2004.yml b/spec/acceptance/nodesets/ubuntu-2004.yml index 346a6a3a..8a020f82 100644 --- a/spec/acceptance/nodesets/ubuntu-2004.yml +++ b/spec/acceptance/nodesets/ubuntu-2004.yml @@ -9,7 +9,7 @@ HOSTS: docker_cmd: '["/sbin/init"]' docker_image_commands: - "rm -f /etc/dpkg/dpkg.cfg.d/excludes" - - 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates iproute2' + - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates' - 'locale-gen en_US.UTF-8' docker_env: - LANG=en_US.UTF-8