Skip to content

Commit cff0e5e

Browse files
authored
Updating operating systems in metadata.json and tests (#422)
Added RHEL 9 and AlmaLinux 8
1 parent 98cb34b commit cff0e5e

File tree

3 files changed

+131
-2
lines changed

3 files changed

+131
-2
lines changed
Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
---
2+
name: "Install test rhel-9"
3+
4+
on:
5+
pull_request:
6+
paths:
7+
- ".github/workflows/**/*"
8+
- "spec/**/*"
9+
- "lib/**/*"
10+
- "tasks/**/*"
11+
- "functions/**/*"
12+
- "types/**/*"
13+
- "plans/**/*"
14+
- "hiera/**/*"
15+
- "manifests/**/*"
16+
- "templates/**/*"
17+
- "files/**/*"
18+
- "metadata.json"
19+
- "Rakefile"
20+
- "Gemfile"
21+
- "provision.yaml"
22+
- ".rspec"
23+
- ".rubocop.yml"
24+
- ".puppet-lint.rc"
25+
- ".fixtures.yml"
26+
branches: [main]
27+
workflow_dispatch: {}
28+
29+
jobs:
30+
test-install:
31+
name: "PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}"
32+
runs-on: ubuntu-20.04
33+
env:
34+
BOLT_GEM: true
35+
BOLT_DISABLE_ANALYTICS: true
36+
LANG: "en_US.UTF-8"
37+
strategy:
38+
fail-fast: false
39+
matrix:
40+
architecture:
41+
- standard-with-dr
42+
- large
43+
- extra-large-with-dr
44+
version:
45+
- 2021.7.7
46+
- 2023.6.0
47+
image:
48+
- rhel-9
49+
steps:
50+
- name: "Checkout Source"
51+
uses: actions/checkout@v2
52+
53+
- name: "Activate Ruby 2.7"
54+
uses: ruby/setup-ruby@v1
55+
with:
56+
ruby-version: "2.7"
57+
bundler-cache: true
58+
59+
- name: "Print bundle environment"
60+
if: ${{ github.repository_owner == 'puppetlabs' }}
61+
run: |
62+
echo ::group::info:bundler
63+
bundle env
64+
echo ::endgroup::
65+
66+
- name: "Provision test cluster"
67+
timeout-minutes: 15
68+
run: |
69+
echo ::group::prepare
70+
mkdir -p $HOME/.ssh
71+
echo 'Host *' > $HOME/.ssh/config
72+
echo ' ServerAliveInterval 150' >> $HOME/.ssh/config
73+
echo ' ServerAliveCountMax 2' >> $HOME/.ssh/config
74+
bundle exec rake spec_prep
75+
echo ::endgroup::
76+
77+
echo ::group::provision
78+
bundle exec bolt plan run peadm_spec::provision_test_cluster \
79+
--modulepath spec/fixtures/modules \
80+
provider=provision_service \
81+
image=${{ matrix.image }} \
82+
architecture=${{ matrix.architecture }} \
83+
--log-level trace
84+
echo ::endgroup::
85+
86+
echo ::group::info:request
87+
cat request.json || true; echo
88+
echo ::endgroup::
89+
90+
echo ::group::info:inventory
91+
sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
92+
echo ::endgroup::
93+
94+
- name: "Install PE on test cluster"
95+
timeout-minutes: 120
96+
run: |
97+
bundle exec bolt plan run peadm_spec::install_test_cluster \
98+
--inventoryfile spec/fixtures/litmus_inventory.yaml \
99+
--modulepath spec/fixtures/modules \
100+
architecture=${{ matrix.architecture }} \
101+
version=${{ matrix.version }}
102+
103+
- name: "Tear down test cluster"
104+
if: ${{ always() }}
105+
continue-on-error: true
106+
run: |
107+
if [ -f spec/fixtures/litmus_inventory.yaml ]; then
108+
echo ::group::tear_down
109+
bundle exec rake 'litmus:tear_down'
110+
echo ::endgroup::
111+
112+
echo ::group::info:request
113+
cat request.json || true; echo
114+
echo ::endgroup::
115+
fi

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,14 @@ groups:
7171

7272
* PEADM is compatible with Puppet Enterprise 2019.8.1 or newer versions.
7373
* To use PEADM, you must first [install Bolt](https://www.puppet.com/docs/bolt/latest/bolt_installing) version 3.17.0 or newer.
74-
* PEADM supports PE installations on the following operating systems: EL 7, EL 8, Ubuntu 18.04, or Ubuntu 20.04.
74+
* PEADM supports PE installations on the following operating systems:
75+
- Amazon Linux 2
76+
- AlmaLinux 8
77+
- CentOS 7 and 8
78+
- RHEL 7, 8 and 9
79+
- SLES 12
80+
- Ubuntu 18.04 and 20.04
81+
7582
* To successfully convert your current PE installation to a PEADM-managed installation, ensure that the PE setting for editing classifier configuration data is enabled. This setting is enabled by default on new PE installations, but it could be disabled if the relevant configuration was removed from your global hiera.yaml file. See the [PE docs](https://www.puppet.com/docs/pe/latest/config_console.html#enable_console_configuration_data) for more information.
7683

7784
## Usage

metadata.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,18 @@
5252
"2"
5353
]
5454
},
55+
{
56+
"operatingsystem": "AlmaLinux",
57+
"operatingsystemrelease": [
58+
"8"
59+
]
60+
},
5561
{
5662
"operatingsystem": "RedHat",
5763
"operatingsystemrelease": [
5864
"7",
59-
"8"
65+
"8",
66+
"9"
6067
]
6168
},
6269
{

0 commit comments

Comments
 (0)