Skip to content

Commit edb83f3

Browse files
authored
Merge pull request #93 from jpartlow/update-acceptance-workflow-for-changed-beaker-acceptance
(maint) Drop beaker parameters from beaker_acceptance.yml call
2 parents e6cc37b + d9e5fbf commit edb83f3

File tree

1 file changed

+8
-53
lines changed

1 file changed

+8
-53
lines changed

.github/workflows/acceptance.yml

Lines changed: 8 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ on:
3838
required: true
3939
type: string
4040
default: main
41+
fork:
42+
description: |-
43+
(Fork) The fork of openvox-server to run the Beaker test suite from.
44+
required: true
45+
type: string
46+
default: openvoxproject
4147
pre-release-build:
4248
description: |-
4349
(Pre-release Build) Whether to test unreleased version
@@ -85,12 +91,6 @@ on:
8591
true)
8692
default: 'https://s3.osuosl.org/openvox-artifacts'
8793
type: string
88-
fork:
89-
description: |-
90-
The github fork of the project-name Beaker test suite to run.
91-
required: true
92-
type: string
93-
default: openvoxproject
9494

9595
permissions:
9696
contents: read
@@ -99,59 +99,14 @@ jobs:
9999
acceptance:
100100
uses: 'openvoxproject/shared-actions/.github/workflows/beaker_acceptance.yml@main'
101101
with:
102+
suite-name: openvox-server
102103
ref: ${{ inputs.ref }}
103-
project-name: openvox-server
104-
install-openvox: true
104+
fork: ${{ inputs.fork }}
105105
openvox-collection: ${{ inputs.collection }}
106106
openvox-agent-version: ${{ inputs.openvox-agent-version }}
107107
openvox-agent-pre-release-build: ${{ inputs.pre-release-build }}
108-
install-openvox-server: true
109108
openvox-server-version: ${{ inputs.openvox-server-version }}
110109
openvox-server-pre-release-build: ${{ inputs.pre-release-build }}
111-
install-openvoxdb: true
112110
openvoxdb-version: ${{ inputs.openvoxdb-version }}
113111
openvoxdb-pre-release-build: ${{ inputs.pre-release-build }}
114112
artifacts-url: ${{ inputs.artifacts-url }}
115-
fork: ${{ inputs.fork }}
116-
acceptance-working-dir: './'
117-
acceptance-pre-suite: |-
118-
[
119-
"acceptance/suites/pre_suite/openvox/configure_type_defaults.rb",
120-
"acceptance/suites/pre_suite/foss/00_setup_environment.rb",
121-
"acceptance/suites/pre_suite/foss/070_InstallCACerts.rb",
122-
"acceptance/suites/pre_suite/foss/10_update_ca_certs.rb",
123-
"acceptance/suites/pre_suite/foss/15_prep_locales.rb",
124-
"acceptance/suites/pre_suite/foss/71_smoke_test_puppetserver.rb",
125-
"acceptance/suites/pre_suite/foss/80_configure_puppet.rb",
126-
"acceptance/suites/pre_suite/foss/85_configure_sut.rb",
127-
"acceptance/suites/pre_suite/foss/90_validate_sign_cert.rb",
128-
"acceptance/suites/pre_suite/foss/95_install_pdb.rb",
129-
"acceptance/suites/pre_suite/foss/99_collect_data.rb"
130-
]
131-
acceptance-tests: |-
132-
[
133-
"acceptance/suites/tests"
134-
]
135-
beaker-options: |-
136-
{
137-
"helper": "acceptance/lib/helper.rb",
138-
"load_path": "acceptance/lib",
139-
"options_file": "acceptance/config/beaker/options.rb"
140-
}
141-
vms: |-
142-
[
143-
{
144-
"role": "primary",
145-
"count": 1,
146-
"cpus": 4,
147-
"mem_mb": 8192,
148-
"cpu_mode": "host-model"
149-
},
150-
{
151-
"role": "agent",
152-
"count": 1,
153-
"cpus": 2,
154-
"mem_mb": 2048,
155-
"cpu_mode": "host-model"
156-
}
157-
]

0 commit comments

Comments
 (0)