Showing with 216 additions and 228 deletions.
  1. +1 −1 .fixtures.yml
  2. +9 −0 .github/dependabot.yml
  3. +1 −1 .github/pull_request_template.md
  4. +1 −1 .github/workflows/add-to-project.yml
  5. +1 −1 .github/workflows/auto_release.yml
  6. +4 −34 .github/workflows/mend.yml
  7. +1 −1 .github/workflows/release-prep.yml
  8. +2 −2 .github/workflows/spec.yml
  9. +4 −3 .github/workflows/test-add-compiler.yaml
  10. +4 −3 .github/workflows/test-add-replica.yaml
  11. +7 −5 .github/workflows/test-backup-restore-migration.yaml
  12. +2 −1 .github/workflows/test-backup-restore.yaml
  13. +4 −3 .github/workflows/test-failover.yaml
  14. +38 −56 .github/workflows/test-fips-install-matrix.yaml
  15. +3 −2 .github/workflows/test-install-latest-dev.yaml
  16. +3 −2 .github/workflows/test-install-latest-xlarge-dev-nightly.yaml
  17. +5 −4 .github/workflows/test-install-matrix.yaml
  18. +5 −4 .github/workflows/test-install-rhel-9.yaml
  19. +26 −42 .github/workflows/test-install.yaml
  20. +4 −3 .github/workflows/test-upgrade-latest-dev.yaml
  21. +4 −3 .github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
  22. +12 −4 .github/workflows/test-upgrade-matrix.yaml
  23. +4 −3 .github/workflows/test-upgrade.yaml
  24. +8 −1 CHANGELOG.md
  25. +3 −3 REFERENCE.md
  26. +1 −1 documentation/automated_recovery.md
  27. +1 −1 documentation/install.md
  28. +1 −1 documentation/res/raw_summary.json
  29. +1 −1 documentation/res/summarized.json
  30. +11 −11 documentation/upgrade.md
  31. +1 −1 examples/upgrade.json
  32. +1 −1 functions/assert_supported_pe_version.pp
  33. +11 −3 metadata.json
  34. +2 −2 plans/install.pp
  35. +1 −1 plans/subplans/install.pp
  36. +4 −1 plans/upgrade.pp
  37. +1 −1 provision.yaml
  38. +4 −2 spec/acceptance/peadm_spec/plans/install_test_cluster.pp
  39. +1 −1 spec/acceptance/peadm_spec/tasks/delete_certname.sh
  40. +1 −1 spec/docker/inventory.yaml
  41. +1 −1 spec/fixtures/plans/pe_conf.json
  42. +1 −1 spec/fixtures/plans/raw_summary.json
  43. +1 −1 spec/functions/assert_supported_pe_version_spec.rb
  44. +6 −3 spec/functions/certname_spec.rb
  45. +1 −1 spec/plans/convert_spec.rb
  46. +1 −1 spec/plans/install_spec.rb
  47. +2 −2 spec/plans/upgrade_spec.rb
  48. +1 −1 tasks/agent_install.ps1
  49. +1 −1 tasks/infrastatus.sh
  50. +1 −1 tasks/os_identification.json
  51. +0 −1 tasks/os_identification.sh
  52. +1 −1 tasks/reinstall_pe.sh
  53. +1 −1 tasks/submit_csr.ps1
2 changes: 1 addition & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fixtures:
apply_helpers: "https://github.com/puppetlabs/puppetlabs-apply_helpers"
bolt_shim: "https://github.com/puppetlabs/puppetlabs-bolt_shim"
format: "https://github.com/voxpupuli/puppet-format"
container_inventory: "https://gitlab.com/nwops/bolt-container_inventory"
container_inventory: "https://gitlab.com/nwops/bolt-container_inventory.git"
node_manager: "https://github.com/puppetlabs/puppetlabs-node_manager.git"
symlinks:
"peadm": "#{source_dir}"
Expand Down
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
time: "13:00"
open-pull-requests-limit: 10
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ Mention any related issues or pull requests.

#### Have you updated the documentation?
- [ ] Yes, I've updated the appropriate docs
- [ ] Not needed
- [ ] Not needed
2 changes: 1 addition & 1 deletion .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.3.0
- uses: actions/add-to-project@v1.0.2
with:
# You can target a repository in a different organization
# to the issue
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- name: "Checkout Source"
if: ${{ github.repository_owner == 'puppetlabs' }}
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
Expand Down
38 changes: 4 additions & 34 deletions .github/workflows/mend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,7 @@ on:
jobs:
mend:
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && github.ref == 'refs/heads/main')
runs-on: "ubuntu-latest"

steps:
- name: "checkout"
uses: "actions/checkout@v3"
with:
fetch-depth: 1
repository: "puppetlabs/puppetlabs-peadm"
ref: "main"

- name: "setup ruby"
uses: "ruby/setup-ruby@v1"
with:
ruby-version: 2.7

- name: "bundle lock"
run: bundle lock

- uses: "actions/setup-java@v3"
with:
distribution: "temurin"
java-version: "17"

- name: "download"
run: curl -o wss-unified-agent.jar https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar

- name: "scan"
run: java -jar wss-unified-agent.jar
env:
WS_APIKEY: ${{ secrets.MEND_API_KEY }}
WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent
WS_USERKEY: ${{ secrets.MEND_TOKEN }}
WS_PRODUCTNAME: InsTalleR
WS_PROJECTNAME: ${{ github.event.repository.name }}
uses: "puppetlabs/cat-github-actions/.github/workflows/tooling_mend_ruby.yml@main"
secrets: "inherit"
with:
product_name: InsTalleR
2 changes: 1 addition & 1 deletion .github/workflows/release-prep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
with:
version: "${{ github.event.inputs.version }}"
secrets: "inherit"
secrets: "inherit"
4 changes: 2 additions & 2 deletions .github/workflows/spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout Source
uses: actions/checkout@v2
uses: actions/checkout@v4
if: ${{ github.repository_owner == 'puppetlabs' }}

- name: Activate Ruby 2.7
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
echo "SANITIZED_PUPPET_VERSION=$(echo '${{ matrix.puppet_version }}' | sed 's/~> //g')" >> $GITHUB_ENV
- name: Checkout Source
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Activate Ruby ${{ matrix.ruby_version }}"
uses: ruby/setup-ruby@v1
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test-add-compiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.8'
default: '2021.7.9'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
SSH_PASS: ${{ secrets.SSH_PASS }}

- name: "Checkout Source"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Activate Ruby 2.7"
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -97,7 +97,8 @@ jobs:
--inventoryfile spec/fixtures/litmus_inventory.yaml \
--modulepath spec/fixtures/modules \
architecture=${{ matrix.architecture }} \
version=${{ matrix.version }}
version=${{ matrix.version }} \
console_password=${{ secrets.CONSOLE_PASSWORD }}
- name: 'Run add_compiler plan'
timeout-minutes: 30
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test-add-replica.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.8'
default: '2021.7.9'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
SSH_PASS: ${{ secrets.SSH_PASS }}

- name: "Checkout Source"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Activate Ruby 2.7"
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -97,7 +97,8 @@ jobs:
--inventoryfile spec/fixtures/litmus_inventory.yaml \
--modulepath spec/fixtures/modules \
architecture=${{ matrix.architecture }} \
version=${{ matrix.version }}
version=${{ matrix.version }} \
console_password=${{ secrets.CONSOLE_PASSWORD }}
- name: 'Run add_replica plan'
timeout-minutes: 30
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/test-backup-restore-migration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
SSH_PASS: ${{ secrets.SSH_PASS }}

- name: "Checkout Source"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Activate Ruby 2.7"
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -94,7 +94,8 @@ jobs:
--inventoryfile spec/fixtures/litmus_inventory.yaml \
--modulepath spec/fixtures/modules \
architecture=${{ inputs.architecture }} \
version=${{ inputs.version }}
version=${{ inputs.version }} \
console_password=${{ secrets.CONSOLE_PASSWORD }}
- name: "Start SSH session"
if: github.event.inputs.ssh-debugging == 'true'
Expand Down Expand Up @@ -161,7 +162,7 @@ jobs:

steps:
- name: "Checkout Source"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Activate Ruby 2.7"
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -216,10 +217,11 @@ jobs:
--inventoryfile spec/fixtures/litmus_inventory.yaml \
--modulepath spec/fixtures/modules \
architecture=${{ inputs.architecture }} \
version=${{ inputs.version }}
version=${{ inputs.version }} \
console_password=${{ secrets.CONSOLE_PASSWORD }}
- name: Wait for backup to finish
uses: lewagon/wait-on-check-action@v1.3.1
uses: lewagon/wait-on-check-action@v1.3.4
with:
ref: ${{ github.ref }}
check-name: "Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }} on ${{ inputs.image }}"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-backup-restore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
SSH_PASS: ${{ secrets.SSH_PASS }}

- name: "Checkout Source"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Activate Ruby 2.7"
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -100,6 +100,7 @@ jobs:
--modulepath spec/fixtures/modules \
architecture=${{ github.event.inputs.architecture || 'extra-large' }} \
version=${{ github.event.inputs.version || '2023.5.0' }} \
console_password=${{ secrets.CONSOLE_PASSWORD }} \
--stream
- name: Perform peadm backup of cluster
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test-failover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version_to_upgrade:
description: 'PE version to upgrade to'
required: false
default: '2021.7.8'
default: '2021.7.9'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
SSH_PASS: ${{ secrets.SSH_PASS }}

- name: "Checkout Source"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Activate Ruby 2.7"
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -100,7 +100,8 @@ jobs:
--inventoryfile spec/fixtures/litmus_inventory.yaml \
--modulepath spec/fixtures/modules \
architecture=${{ matrix.architecture }} \
version=${{ matrix.version }}
version=${{ matrix.version }} \
console_password=${{ secrets.CONSOLE_PASSWORD }}
- name: 'Perform failover'
run: |
Expand Down
Loading