Skip to content

Commit b2f854e

Browse files
committed
Standardize and updated nodesets & ensure working beaker tests
1 parent a65a63e commit b2f854e

File tree

10 files changed

+60
-94
lines changed

10 files changed

+60
-94
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> - 5.0.0
2+
- Remove EOL OS's support (EL7)
3+
- Stardardize beaker nodesets
4+
- beaker test improvements
5+
16
* Mon Dec 30 2024 Steven Pritchard <[email protected]> - 4.14.0
27
- Fix use of legacy facts (#301)
38

manifests/stages.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
class simplib::stages {
1616
include stdlib::stages
1717

18-
stage { 'simp_prep': before => Stage['setup'] }
18+
stage { 'simp_prep': before => Stage['setup'] }
1919
stage { 'simp_finalize': require => Stage['deploy'] }
2020
}

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simp-simplib",
3-
"version": "4.14.0",
3+
"version": "5.0.0",
44
"author": "SIMP Team",
55
"summary": "A collection of common SIMP functions, facts, and types",
66
"license": "Apache-2.0",

spec/acceptance/nodesets/default.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
---
22
HOSTS:
3-
el7:
4-
roles:
5-
- client
6-
- default
7-
- master
8-
- prelink
9-
platform: el-7-x86_64
10-
box: centos/7
3+
el9:
4+
platform: el-9-x86_64
5+
box: generic/rocky9
116
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
12-
family: centos-cloud/centos-7
13-
gce_machine_type: n1-standard-2
14-
el8:
15-
roles:
16-
- client
17-
platform: el-8-x86_64
18-
box: generic/centos8
19-
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
20-
family: centos-cloud/centos-stream-8
7+
family: rocky-linux-cloud/rocky-linux-9
218
gce_machine_type: n1-standard-2
229
CONFIG:
2310
log_level: verbose
11+
synced_folder: disabled
2412
type: aio
25-
vagrant_cpus: 1
26-
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

Lines changed: 0 additions & 26 deletions
This file was deleted.

spec/acceptance/nodesets/oel8.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
HOSTS:
3+
oel8:
4+
platform: el-8-x86_64
5+
box: generic/oracle8
6+
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
7+
family: sicura-image-build/oracle-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/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/rhel7.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

spec/acceptance/nodesets/rhel8.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
---
22
HOSTS:
3-
server-el8:
4-
roles:
5-
- server
6-
- default
7-
- master
3+
el8:
84
platform: el-8-x86_64
95
box: generic/rhel8
106
hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
11-
yum_repos:
12-
epel:
13-
mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch
14-
gpgkeys:
15-
- https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8
167
family: rhel-cloud/rhel-8
178
gce_machine_type: n1-standard-2
189
CONFIG:
1910
log_level: verbose
11+
synced_folder: disabled
2012
type: aio
21-
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
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') %>"

0 commit comments

Comments
 (0)