Skip to content

Commit b488582

Browse files
CoMfUcIoSCoMfUcIoS
authored
(PE-39612) update default PE version to 2021.7.9 and 2023.8.0 (#488)
- Updated default PE version in various GitHub workflow YAML files. - Updated example parameters in documentation files. - Adjusted supported PE version range in assert_supported_pe_version function. - Modified unit tests to reflect the new default PE version.
1 parent ab9db39 commit b488582

20 files changed

+94
-130
lines changed

‎.github/workflows/test-add-compiler.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
version:
1616
description: 'PE version to install'
1717
required: true
18-
default: '2021.7.8'
18+
default: '2021.7.9'
1919
ssh-debugging:
2020
description: 'Boolean; whether or not to pause for ssh debugging'
2121
required: true

‎.github/workflows/test-add-replica.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
version:
1616
description: 'PE version to install'
1717
required: true
18-
default: '2021.7.8'
18+
default: '2021.7.9'
1919
ssh-debugging:
2020
description: 'Boolean; whether or not to pause for ssh debugging'
2121
required: true

‎.github/workflows/test-failover.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
version_to_upgrade:
1616
description: 'PE version to upgrade to'
1717
required: false
18-
default: '2021.7.8'
18+
default: '2021.7.9'
1919
ssh-debugging:
2020
description: 'Boolean; whether or not to pause for ssh debugging'
2121
required: true

‎.github/workflows/test-fips-install-matrix.yaml‎

Lines changed: 35 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,60 @@
11
---
2-
name: "Install fips test matrix"
3-
2+
name: Install fips test matrix
43
on:
54
pull_request:
65
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"
6+
- .github/workflows/**/*
7+
- spec/**/*
8+
- lib/**/*
9+
- tasks/**/*
10+
- functions/**/*
11+
- types/**/*
12+
- plans/**/*
13+
- hiera/**/*
14+
- manifests/**/*
15+
- templates/**/*
16+
- files/**/*
17+
- metadata.json
18+
- Rakefile
19+
- Gemfile
20+
- provision.yaml
21+
- .rspec
22+
- .rubocop.yml
23+
- .puppet-lint.rc
24+
- .fixtures.yml
2625
branches: [main]
2726
workflow_dispatch: {}
28-
2927
jobs:
3028
test-install:
31-
name: "PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }} with fips ${{ matrix.fips }}"
29+
name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
30+
with fips ${{ matrix.fips }}
3231
runs-on: ubuntu-20.04
3332
env:
3433
BOLT_GEM: true
3534
BOLT_DISABLE_ANALYTICS: true
36-
LANG: "en_US.UTF-8"
35+
LANG: en_US.UTF-8
3736
strategy:
3837
fail-fast: false
3938
matrix:
40-
architecture:
41-
- standard-with-dr
42-
- large
43-
- extra-large-with-dr
44-
version:
45-
- 2019.8.12
46-
- 2021.7.8
47-
- 2023.7.0
48-
image:
49-
- rhel-8
50-
fips:
51-
- enable
52-
39+
architecture: [standard-with-dr, large, extra-large-with-dr]
40+
version: [2019.8.12, 2021.7.9, 2023.8.0]
41+
image: [rhel-8]
42+
fips: [enable]
5343
steps:
54-
- name: "Checkout Source"
44+
- name: Checkout Source
5545
uses: actions/checkout@v4
56-
57-
- name: "Activate Ruby 2.7"
46+
- name: Activate Ruby 2.7
5847
uses: ruby/setup-ruby@v1
5948
with:
60-
ruby-version: "2.7"
49+
ruby-version: '2.7'
6150
bundler-cache: true
62-
63-
- name: "Print bundle environment"
51+
- name: Print bundle environment
6452
if: ${{ github.repository_owner == 'puppetlabs' }}
6553
run: |
6654
echo ::group::info:bundler
6755
bundle env
6856
echo ::endgroup::
69-
70-
- name: "Provision test cluster"
57+
- name: Provision test cluster
7158
timeout-minutes: 15
7259
run: |
7360
echo ::group::prepare
@@ -77,24 +64,20 @@ jobs:
7764
echo ' ServerAliveCountMax 2' >> $HOME/.ssh/config
7865
bundle exec rake spec_prep
7966
echo ::endgroup::
80-
8167
echo ::group::provision
8268
bundle exec bolt plan run peadm_spec::provision_test_cluster \
8369
--modulepath spec/fixtures/modules \
8470
provider=provision_service \
8571
image=${{ matrix.image }} \
8672
architecture=${{ matrix.architecture }}
8773
echo ::endgroup::
88-
8974
echo ::group::info:request
9075
cat request.json || true; echo
9176
echo ::endgroup::
92-
9377
echo ::group::info:inventory
9478
sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
9579
echo ::endgroup::
96-
97-
- name: "Install PE on test cluster"
80+
- name: Install PE on test cluster
9881
timeout-minutes: 120
9982
run: |
10083
bundle exec bolt plan run peadm_spec::install_test_cluster \
@@ -104,16 +87,14 @@ jobs:
10487
version=${{ matrix.version }} \
10588
fips=${{ matrix.fips }} \
10689
console_password=${{ secrets.CONSOLE_PASSWORD }}
107-
108-
- name: "Tear down test cluster"
90+
- name: Tear down test cluster
10991
if: ${{ always() }}
11092
continue-on-error: true
111-
run: |
93+
run: |-
11294
if [ -f spec/fixtures/litmus_inventory.yaml ]; then
11395
echo ::group::tear_down
11496
bundle exec rake 'litmus:tear_down'
11597
echo ::endgroup::
116-
11798
echo ::group::info:request
11899
cat request.json || true; echo
119100
echo ::endgroup::

‎.github/workflows/test-install-matrix.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343
- extra-large-with-dr
4444
version:
4545
- 2019.8.12
46-
- 2021.7.8
47-
- 2023.7.0
46+
- 2021.7.9
47+
- 2023.8.0
4848
image:
4949
- almalinux-cloud/almalinux-8
5050
steps:

‎.github/workflows/test-install-rhel-9.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
- large
4343
- extra-large-with-dr
4444
version:
45-
- 2021.7.8
46-
- 2023.7.0
45+
- 2021.7.9
46+
- 2023.8.0
4747
image:
4848
- rhel-9
4949
steps:

‎.github/workflows/test-install.yaml‎

Lines changed: 23 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,59 @@
11
---
2-
name: "Install test"
3-
2+
name: Install test
43
on:
54
workflow_dispatch:
65
inputs:
76
image:
8-
description: 'GCP image for test cluster'
7+
description: GCP image for test cluster
98
required: true
10-
default: 'almalinux-cloud/almalinux-8'
9+
default: almalinux-cloud/almalinux-8
1110
architecture:
12-
description: 'PE architecture to test'
11+
description: PE architecture to test
1312
required: true
14-
default: 'standard'
13+
default: standard
1514
version:
16-
description: 'PE version to install'
15+
description: PE version to install
1716
required: true
18-
default: '2021.7.8'
17+
default: 2021.7.9
1918
ssh-debugging:
20-
description: 'Boolean; whether or not to pause for ssh debugging'
19+
description: Boolean; whether or not to pause for ssh debugging
2120
required: true
2221
default: 'false'
23-
2422
jobs:
2523
test-install:
26-
name: "PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}"
24+
name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
2725
runs-on: ubuntu-20.04
2826
env:
2927
BOLT_GEM: true
3028
BOLT_DISABLE_ANALYTICS: true
31-
LANG: 'en_US.UTF-8'
29+
LANG: en_US.UTF-8
3230
strategy:
3331
fail-fast: false
3432
matrix:
35-
architecture:
36-
- "${{ github.event.inputs.architecture }}"
37-
version:
38-
- "${{ github.event.inputs.version }}"
39-
image:
40-
- "${{ github.event.inputs.image }}"
41-
33+
architecture: ['${{ github.event.inputs.architecture }}']
34+
version: ['${{ github.event.inputs.version }}']
35+
image: ['${{ github.event.inputs.image }}']
4236
steps:
43-
- name: 'Start SSH session'
37+
- name: Start SSH session
4438
if: ${{ github.event.inputs.ssh-debugging == 'true' }}
4539
uses: luchihoratiu/debug-via-ssh@main
4640
with:
4741
NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
4842
SSH_PASS: ${{ secrets.SSH_PASS }}
49-
50-
- name: "Checkout Source"
43+
- name: Checkout Source
5144
uses: actions/checkout@v4
52-
53-
- name: "Activate Ruby 2.7"
45+
- name: Activate Ruby 2.7
5446
uses: ruby/setup-ruby@v1
5547
with:
56-
ruby-version: "2.7"
48+
ruby-version: '2.7'
5749
bundler-cache: true
58-
59-
- name: "Print bundle environment"
50+
- name: Print bundle environment
6051
if: ${{ github.repository_owner == 'puppetlabs' }}
6152
run: |
6253
echo ::group::info:bundler
6354
bundle env
6455
echo ::endgroup::
65-
66-
- name: 'Provision test cluster'
56+
- name: Provision test cluster
6757
timeout-minutes: 15
6858
run: |
6959
echo ::group::prepare
@@ -73,24 +63,20 @@ jobs:
7363
echo ' ServerAliveCountMax 2' >> $HOME/.ssh/config
7464
bundle exec rake spec_prep
7565
echo ::endgroup::
76-
7766
echo ::group::provision
7867
bundle exec bolt plan run peadm_spec::provision_test_cluster \
7968
--modulepath spec/fixtures/modules \
8069
provider=provision_service \
8170
image=${{ matrix.image }} \
8271
architecture=${{ matrix.architecture }}
8372
echo ::endgroup::
84-
8573
echo ::group::info:request
8674
cat request.json || true; echo
8775
echo ::endgroup::
88-
8976
echo ::group::info:inventory
9077
sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
9178
echo ::endgroup::
92-
93-
- name: 'Install PE on test cluster'
79+
- name: Install PE on test cluster
9480
timeout-minutes: 120
9581
run: |
9682
bundle exec bolt plan run peadm_spec::install_test_cluster \
@@ -99,25 +85,22 @@ jobs:
9985
architecture=${{ matrix.architecture }} \
10086
version=${{ matrix.version }} \
10187
console_password=${{ secrets.CONSOLE_PASSWORD }}
102-
103-
- name: 'Wait as long as the file ${HOME}/pause file is present'
88+
- name: Wait as long as the file ${HOME}/pause file is present
10489
if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
10590
run: |
10691
while [ -f "${HOME}/pause" ] ; do
10792
echo "${HOME}/pause present, sleeping for 60 seconds..."
10893
sleep 60
10994
done
11095
echo "${HOME}/pause absent, continuing workflow."
111-
112-
- name: 'Tear down test cluster'
96+
- name: Tear down test cluster
11397
if: ${{ always() }}
11498
continue-on-error: true
115-
run: |
99+
run: |-
116100
if [ -f spec/fixtures/litmus_inventory.yaml ]; then
117101
echo ::group::tear_down
118102
bundle exec rake 'litmus:tear_down'
119103
echo ::endgroup::
120-
121104
echo ::group::info:request
122105
cat request.json || true; echo
123106
echo ::endgroup::

‎.github/workflows/test-upgrade-latest-dev.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
type: string
2525
required: true
2626
description: "The initial version of PE to install before upgrade"
27-
default: "2021.7.8"
27+
default: "2021.7.9"
2828
ssh-debugging:
2929
description: "Boolean; whether or not to pause for ssh debugging"
3030
required: true

‎.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
architecture:
2020
- "extra-large-with-dr"
2121
version:
22-
- "2021.7.8"
22+
- "2021.7.9"
2323
image:
2424
- "almalinux-cloud/almalinux-8"
2525

‎.github/workflows/test-upgrade-matrix.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ jobs:
4343
- 'extra-large-with-dr'
4444
version:
4545
- '2019.8.12'
46-
- '2021.7.8'
46+
- '2021.7.9'
4747
version_to_upgrade:
48-
- '2021.7.8'
49-
- '2023.7.0'
48+
- '2021.7.9'
49+
- '2023.8.0'
5050
image:
5151
- 'almalinux-cloud/almalinux-8'
5252
download_mode:
5353
- 'direct'
5454
exclude:
5555
- version: '2019.8.12'
56-
version_to_upgrade: '2023.7.0'
57-
- version: '2021.7.8'
58-
version_to_upgrade: '2021.7.8'
56+
version_to_upgrade: '2023.8.0'
57+
- version: '2021.7.9'
58+
version_to_upgrade: '2021.7.9'
5959

6060
steps:
6161
- name: 'Start SSH session'

0 commit comments

Comments
 (0)