Skip to content

Commit cb24b88

Browse files
davidmalloncaresdavidmalloncares
committed
MAINT try docker for provisioning
1 parent 7614192 commit cb24b88

20 files changed

+77
-51
lines changed

Diff for: ‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ jobs:
1414
needs: Spec
1515
uses: puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main
1616
with:
17-
flags: --provision-service
17+
flags: --docker
1818
secrets: inherit

Diff for: ‎.github/workflows/test-add-compiler-matrix.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
matrix:
3838
architecture: [standard, large, extra-large]
3939
version: [2021.7.9, 2023.8.2, 2025.1.0]
40-
image: [almalinux-cloud/almalinux-8]
40+
image: ['litmusimage/ubuntu:24.04']
41+
download_mode: [bolthost]
4142
steps:
4243
- name: Checkout Source
4344
uses: actions/checkout@v4
@@ -65,10 +66,13 @@ jobs:
6566
echo ::group::provision
6667
bundle exec bolt plan run peadm_spec::provision_test_cluster \
6768
--modulepath spec/fixtures/modules \
68-
provider=provision_service \
69+
provider=docker \
6970
image=${{ matrix.image }} \
7071
architecture=${{ matrix.architecture }}-with-extra-compiler
7172
echo ::endgroup::
73+
echo ::group::mv inventory.yaml to ./spec/fixtures/litmus_inventory.yaml
74+
mv inventory.yaml spec/fixtures/litmus_inventory.yaml
75+
echo ::endgroup::
7276
echo ::group::info:request
7377
cat request.json || true; echo
7478
echo ::endgroup::
@@ -82,6 +86,7 @@ jobs:
8286
--inventoryfile spec/fixtures/litmus_inventory.yaml \
8387
--modulepath spec/fixtures/modules \
8488
architecture=${{ matrix.architecture }} \
89+
download_mode=${{ matrix.download_mode }} \
8590
console_password=${{ secrets.CONSOLE_PASSWORD }} \
8691
version=${{ matrix.version }}
8792
- name: Run add_compilers plan

Diff for: ‎.github/workflows/test-add-compiler.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
image:
7-
description: GCP image for test cluster
7+
description: Docker image for test cluster
88
required: true
9-
default: almalinux-cloud/almalinux-8
9+
default: litmusimage/ubuntu:24.04
1010
architecture:
1111
description: PE architecture to test
1212
required: true
@@ -66,7 +66,7 @@ jobs:
6666
echo ::group::provision
6767
bundle exec bolt plan run peadm_spec::provision_test_cluster \
6868
--modulepath spec/fixtures/modules \
69-
provider=provision_service \
69+
provider=docker \
7070
image=${{ matrix.image }} \
7171
architecture=${{ matrix.architecture }}-with-extra-compiler
7272
echo ::endgroup::

Diff for: ‎.github/workflows/test-add-replica-matrix.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
matrix:
3838
architecture: [standard, standard-with-dr, large, extra-large]
3939
version: [2023.8.2, 2025.1.0]
40-
image: [almalinux-cloud/almalinux-8]
40+
image: [litmusimage/ubuntu:24.04]
4141
steps:
4242
- name: Checkout Source
4343
uses: actions/checkout@v4
@@ -65,7 +65,7 @@ jobs:
6565
echo ::group::provision
6666
bundle exec bolt plan run peadm_spec::provision_test_cluster \
6767
--modulepath spec/fixtures/modules \
68-
provider=provision_service \
68+
provider=docker \
6969
image=${{ matrix.image }} \
7070
architecture=${{ matrix.architecture }}-and-spare-replica
7171
echo ::endgroup::

Diff for: ‎.github/workflows/test-add-replica.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
image:
7-
description: GCP image for test cluster
7+
description: Docker image for test cluster
88
required: true
9-
default: almalinux-cloud/almalinux-8
9+
default: litmusimage/ubuntu:24.04
1010
architecture:
1111
description: PE architecture to test
1212
required: true
@@ -66,7 +66,7 @@ jobs:
6666
echo ::group::provision
6767
bundle exec bolt plan run peadm_spec::provision_test_cluster \
6868
--modulepath spec/fixtures/modules \
69-
provider=provision_service \
69+
provider=docker \
7070
image=${{ matrix.image }} \
7171
architecture=${{ matrix.architecture }}-and-spare-replica
7272
echo ::endgroup::

Diff for: ‎.github/workflows/test-backup-restore-migration.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
image:
7-
description: GCP image for test cluster
7+
description: Docker image for test cluster
88
required: true
9-
default: almalinux-cloud/almalinux-8
9+
default: litmusimage/ubuntu:24.04
1010
architecture:
1111
description: PE architecture to test
1212
required: true
@@ -61,7 +61,7 @@ jobs:
6161
echo ::group::provision
6262
bundle exec bolt plan run peadm_spec::provision_test_cluster \
6363
--modulepath spec/fixtures/modules \
64-
provider=provision_service \
64+
provider=docker \
6565
image=${{ inputs.image }} \
6666
architecture=${{ inputs.architecture }}
6767
echo ::endgroup::
@@ -170,7 +170,7 @@ jobs:
170170
echo ::group::provision
171171
bundle exec bolt plan run peadm_spec::provision_test_cluster \
172172
--modulepath spec/fixtures/modules \
173-
provider=provision_service \
173+
provider=docker \
174174
image=${{ inputs.image }} \
175175
architecture=${{ inputs.architecture }}
176176
echo ::endgroup::

Diff for: ‎.github/workflows/test-backup-restore.yaml

+26-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,33 @@
22
name: Backup and restore test
33
on:
44
pull_request:
5-
types: [ready_for_review]
5+
paths:
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
25+
branches: [main]
626
workflow_dispatch:
727
inputs:
828
image:
9-
description: GCP image for test cluster
29+
description: Docker image for test cluster
1030
required: true
11-
default: almalinux-cloud/almalinux-8
31+
default: litmusimage/ubuntu:24.04
1232
architecture:
1333
description: PE architecture to test
1434
required: true
@@ -32,7 +52,7 @@ on:
3252
jobs:
3353
backup-restore-test:
3454
name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.1.0' }}\
35-
\ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}"
55+
\ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'litmusimage/ubuntu:24.04' }}"
3656
runs-on: ubuntu-latest
3757
env:
3858
BOLT_GEM: true
@@ -71,8 +91,8 @@ jobs:
7191
echo ::group::provision
7292
bundle exec bolt plan run peadm_spec::provision_test_cluster \
7393
--modulepath spec/fixtures/modules \
74-
provider=provision_service \
75-
image=${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }} \
94+
provider=docker \
95+
image=${{ github.event.inputs.image || 'litmusimage/ubuntu:24.04' }} \
7696
architecture=${{ github.event.inputs.architecture || 'extra-large' }}
7797
echo ::endgroup::
7898
echo ::group::info:request

Diff for: ‎.github/workflows/test-failover.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
image:
7-
description: GCP image for test cluster
7+
description: Docker image for test cluster
88
required: true
9-
default: almalinux-cloud/almalinux-8
9+
default: litmusimage/ubuntu:24.04
1010
version:
1111
description: PE version to install
1212
required: true
@@ -70,7 +70,7 @@ jobs:
7070
echo ::group::provision
7171
bundle exec bolt plan run peadm_spec::provision_test_cluster \
7272
--modulepath spec/fixtures/modules \
73-
provider=provision_service \
73+
provider=docker \
7474
image=${{ matrix.image }} \
7575
architecture=${{ matrix.architecture }}-and-spare-replica
7676
echo ::endgroup::

Diff for: ‎.github/workflows/test-install-latest-dev.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
image:
7-
description: GCP image for test cluster
7+
description: Docker image for test cluster
88
required: true
9-
default: almalinux-cloud/almalinux-8
9+
default: litmusimage/ubuntu:24.04
1010
architecture:
1111
type: choice
1212
required: true
@@ -69,7 +69,7 @@ jobs:
6969
echo ::group::provision
7070
bundle exec bolt plan run peadm_spec::provision_test_cluster \
7171
--modulepath spec/fixtures/modules \
72-
provider=provision_service \
72+
provider=docker \
7373
image=${{ matrix.image }} \
7474
architecture=${{ matrix.architecture }}
7575
echo ::endgroup::

Diff for: ‎.github/workflows/test-install-latest-xlarge-dev-nightly.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
architecture: [extra-large-with-dr]
24-
image: [almalinux-cloud/almalinux-8]
24+
image: [litmusimage/ubuntu:24.04]
2525
steps:
2626
- name: Start SSH session
2727
if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -55,7 +55,7 @@ jobs:
5555
echo ::group::provision
5656
bundle exec bolt plan run peadm_spec::provision_test_cluster \
5757
--modulepath spec/fixtures/modules \
58-
provider=provision_service \
58+
provider=docker \
5959
image=${{ matrix.image }} \
6060
architecture=${{ matrix.architecture }}
6161
echo ::endgroup::

Diff for: ‎.github/workflows/test-install-matrix.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
matrix:
3838
architecture: [standard-with-dr, large, extra-large-with-dr]
3939
version: [2019.8.12, 2021.7.9, 2023.8.2, 2025.1.0]
40-
image: [almalinux-cloud/almalinux-8]
40+
image: [litmusimage/ubuntu:24.04]
4141
steps:
4242
- name: Checkout Source
4343
uses: actions/checkout@v4
@@ -65,7 +65,7 @@ jobs:
6565
echo ::group::provision
6666
bundle exec bolt plan run peadm_spec::provision_test_cluster \
6767
--modulepath spec/fixtures/modules \
68-
provider=provision_service \
68+
provider=docker \
6969
image=${{ matrix.image }} \
7070
architecture=${{ matrix.architecture }} \
7171
--log-level trace

Diff for: ‎.github/workflows/test-install.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
image:
7-
description: GCP image for test cluster
7+
description: Docker image for test cluster
88
required: true
9-
default: almalinux-cloud/almalinux-8
9+
default: litmusimage/ubuntu:24.04
1010
architecture:
1111
description: PE architecture to test
1212
required: true
@@ -66,7 +66,7 @@ jobs:
6666
echo ::group::provision
6767
bundle exec bolt plan run peadm_spec::provision_test_cluster \
6868
--modulepath spec/fixtures/modules \
69-
provider=provision_service \
69+
provider=docker \
7070
image=${{ matrix.image }} \
7171
architecture=${{ matrix.architecture }}
7272
echo ::endgroup::

Diff for: ‎.github/workflows/test-migration.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ jobs:
4444
# - large-with-dr
4545
# - extra-large-with-dr
4646
version: [2021.7.9, 2023.8.2, 2025.1.0]
47-
image: [almalinux-cloud/almalinux-8]
47+
image: [litmusimage/ubuntu:24.04]
4848
include:
4949
- architecture: standard
5050
version: 2023.8.0
51-
image: almalinux-cloud/almalinux-8
51+
image: litmusimage/ubuntu:22.04
5252
new_pe_version: 2025.0.0
5353
steps:
5454
- name: Checkout Source
@@ -79,7 +79,7 @@ jobs:
7979
echo ::group::provision
8080
bundle exec bolt plan run peadm_spec::provision_test_cluster \
8181
--modulepath spec/fixtures/modules \
82-
provider=provision_service \
82+
provider=docker \
8383
image=${{ matrix.image }} \
8484
architecture=${{ matrix.architecture }}-migration \
8585
--log-level trace

Diff for: ‎.github/workflows/test-replace-failed-postgresql.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
architecture: [extra-large-with-dr-and-spare-replica]
3939
install_architecture: [extra-large-with-dr]
4040
version: [2021.7.9, 2023.8.2, 2025.1.0]
41-
image: [almalinux-cloud/almalinux-8]
41+
image: [litmusimage/ubuntu:24.04]
4242
steps:
4343
- name: Checkout Source
4444
uses: actions/checkout@v4
@@ -68,7 +68,7 @@ jobs:
6868
echo ::group::provision
6969
bundle exec bolt plan run peadm_spec::provision_test_cluster \
7070
--modulepath spec/fixtures/modules \
71-
provider=provision_service \
71+
provider=docker \
7272
image=${{ matrix.image }} \
7373
architecture=${{ matrix.architecture }} \
7474
--log-level trace

Diff for: ‎.github/workflows/test-upgrade-latest-dev.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
image:
7-
description: GCP image for test cluster
7+
description: Docker image for test cluster
88
required: true
9-
default: almalinux-cloud/almalinux-8
9+
default: litmusimage/ubuntu:24.04
1010
architecture:
1111
type: choice
1212
required: true
@@ -76,7 +76,7 @@ jobs:
7676
echo ::group::provision
7777
bundle exec bolt plan run peadm_spec::provision_test_cluster \
7878
--modulepath spec/fixtures/modules \
79-
provider=provision_service \
79+
provider=docker \
8080
image=${{ matrix.image }} \
8181
architecture=${{ matrix.architecture }}
8282
echo ::endgroup::

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
matrix:
1818
architecture: [extra-large-with-dr]
1919
version: [2023.8.2]
20-
image: [almalinux-cloud/almalinux-8]
20+
image: [litmusimage/ubuntu:24.04]
2121
steps:
2222
- name: Checkout Source
2323
uses: actions/checkout@v4
@@ -45,7 +45,7 @@ jobs:
4545
echo ::group::provision
4646
bundle exec bolt plan run peadm_spec::provision_test_cluster \
4747
--modulepath spec/fixtures/modules \
48-
provider=provision_service \
48+
provider=docker \
4949
image=${{ matrix.image }} \
5050
architecture=${{ matrix.architecture }}
5151
echo ::endgroup::

Diff for: ‎.github/workflows/test-upgrade-matrix.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
architecture: [standard, extra-large-with-dr]
4040
version: [2019.8.12, 2021.7.9, 2023.8.2]
4141
version_to_upgrade: [2021.7.9, 2023.8.2, 2025.1.0]
42-
image: [almalinux-cloud/almalinux-8]
42+
image: [litmusimage/ubuntu:24.04]
4343
download_mode: [direct]
4444
exclude:
4545
- version: 2019.8.12
@@ -91,7 +91,7 @@ jobs:
9191
echo ::group::provision
9292
bundle exec bolt plan run peadm_spec::provision_test_cluster \
9393
--modulepath spec/fixtures/modules \
94-
provider=provision_service \
94+
provider=docker \
9595
image=${{ matrix.image }} \
9696
architecture=${{ matrix.architecture }}
9797
echo ::endgroup::

0 commit comments

Comments
 (0)