Skip to content

Commit

Permalink
Replace CentOS 8 support with Rocky 8 (#221)
Browse files Browse the repository at this point in the history
* Replace CentOS 8 support with Rocky 8
* Depend on newer Java module to get Rocky Linux 8 support
  • Loading branch information
treydock authored Nov 5, 2021
1 parent 8d70221 commit db72f3c
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
matrix:
set:
- "centos-7"
- "centos-8"
- "rocky-8"
- "debian-9"
- "debian-10"
- "ubuntu-1804"
Expand Down
10 changes: 1 addition & 9 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
acceptance_matrix:
set:
- centos-7
- centos-8
- rocky-8
- debian-9
- debian-10
- ubuntu-1804
Expand Down Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -56,7 +56,12 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7",
"7"
]
},
{
"operatingsystem": "Rocky",
"operatingsystemrelease": [
"8"
]
},
Expand All @@ -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"
}
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-1804.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-2004.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit db72f3c

Please sign in to comment.