Skip to content

Commit d7efa25

Browse files
rgardner4012rgardner4012
committed
Standardize and updated nodesets & ensure working beaker tests
1 parent b7b8ac5 commit d7efa25

File tree

12 files changed

+126
-12
lines changed

12 files changed

+126
-12
lines changed

‎CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* Thu May 08 2025 Richard Gardner <rick@sicura-us> - 1.0.0
2+
- Remove EOL OS's support (EL7, CentOS8)
3+
- Stardardize beaker nodesets
4+
- beaker test improvements
5+
16
* Mon Oct 23 2023 Steven Pritchard <[email protected]> - 0.6.0
27
- [puppetsync] Add EL9 support
38

‎metadata.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simp-crypto_policy",
3-
"version": "0.6.0",
3+
"version": "1.0.0",
44
"author": "SIMP Team",
55
"summary": "Manage, and provide information about, the system-wide crypto policies",
66
"license": "Apache-2.0",
@@ -28,7 +28,6 @@
2828
{
2929
"operatingsystem": "CentOS",
3030
"operatingsystemrelease": [
31-
"8",
3231
"9"
3332
]
3433
},

‎spec/acceptance/nodesets/alma8.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
el8:
4+
platform: el-8-x86_64
5+
box: generic/alma8
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: almalinux-cloud/almalinux-8
8+
gce_machine_type: n1-standard-2
9+
CONFIG:
10+
log_level: verbose
11+
synced_folder: disabled
12+
type: aio
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/alma9.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
el9:
4+
platform: el-9-x86_64
5+
box: generic/alma9
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: almalinux-cloud/almalinux-9
8+
gce_machine_type: n1-standard-2
9+
CONFIG:
10+
log_level: verbose
11+
synced_folder: disabled
12+
type: aio
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/centos9.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
el9:
4+
platform: el-9-x86_64
5+
box: generic/centos9s
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: centos-cloud/centos-stream-9
8+
gce_machine_type: n1-standard-2
9+
CONFIG:
10+
log_level: verbose
11+
synced_folder: disabled
12+
type: aio
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/default.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
---
22
HOSTS:
3-
el8:
4-
roles:
5-
- default
6-
platform: el-8-x86_64
7-
box: generic/centos8
3+
el9:
4+
platform: el-9-x86_64
5+
box: generic/rocky9
86
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
9-
family: centos-cloud/centos-stream-8
7+
family: rocky-linux-cloud/rocky-linux-9
108
gce_machine_type: n1-standard-2
119
CONFIG:
1210
log_level: verbose
1311
synced_folder: disabled
1412
type: aio
15-
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/oel.yml renamed to ‎spec/acceptance/nodesets/oel8.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
HOSTS:
33
oel8:
4-
roles:
5-
- default
64
platform: el-8-x86_64
75
box: generic/oracle8
86
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
@@ -12,4 +10,5 @@ CONFIG:
1210
log_level: verbose
1311
synced_folder: disabled
1412
type: aio
15-
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/oel9.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
oel9:
4+
platform: el-9-x86_64
5+
box: generic/oracle9
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: sicura-image-build/oracle-linux-9
8+
gce_machine_type: n1-standard-2
9+
CONFIG:
10+
log_level: verbose
11+
synced_folder: disabled
12+
type: aio
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/rhel8.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
el8:
4+
platform: el-8-x86_64
5+
box: generic/rhel8
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: rhel-cloud/rhel-8
8+
gce_machine_type: n1-standard-2
9+
CONFIG:
10+
log_level: verbose
11+
synced_folder: disabled
12+
type: aio
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/rhel9.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
el9:
4+
platform: el-9-x86_64
5+
box: generic/rhel9
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: rhel-cloud/rhel-9
8+
gce_machine_type: n1-standard-2
9+
CONFIG:
10+
log_level: verbose
11+
synced_folder: disabled
12+
type: aio
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/rocky8.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
el8:
4+
platform: el-8-x86_64
5+
box: generic/rocky8
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: rocky-linux-cloud/rocky-linux-8
8+
gce_machine_type: n1-standard-2
9+
CONFIG:
10+
log_level: verbose
11+
synced_folder: disabled
12+
type: aio
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

‎spec/acceptance/nodesets/rocky9.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
el9:
4+
platform: el-9-x86_64
5+
box: generic/rocky9
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: rocky-linux-cloud/rocky-linux-9
8+
gce_machine_type: n1-standard-2
9+
CONFIG:
10+
log_level: verbose
11+
synced_folder: disabled
12+
type: aio
13+
vagrant_memsize: 256
14+
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

0 commit comments

Comments
 (0)