Skip to content

Commit dbf51a8

Browse files
committed
(maint) Clarify inventory, ssh key file in acceptance.yml
Just notes that the files were generated as part of the nested_vms action step.
1 parent b9ebe5d commit dbf51a8

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/acceptance.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,19 +107,21 @@ jobs:
107107
working-directory: kvm_automation_tooling
108108
env:
109109
HOSTS_YAML: ${{ github.workspace }}/acceptance/hosts.yaml
110+
# Generated by the nested_vms action.
111+
INVENTORY: terraform/instances/inventory.test.yaml
110112
run: |-
111113
bundle exec bolt plan run \
112114
kvm_automation_tooling::dev::generate_beaker_hosts_file \
113-
--inventory terraform/instances/inventory.*.yaml \
115+
--inventory "${INVENTORY}" \
114116
hosts_yaml="${HOSTS_YAML}"
115117
- name: Run Beaker
116118
working-directory: acceptance
119+
env:
120+
# Generated by the nested_vms action.
121+
SSH_KEY: ~/.ssh/ssh-id-test
117122
run: |-
118-
# TODO The ssh keyfile here is from the kvm_automation_tooling
119-
# action...this should be cleaned up to be more discoverable
120-
# or supplied as an input perhaps.
121123
bundle exec beaker init --hosts hosts.yaml \
122-
--preserve-hosts always --keyfile ~/.ssh/ssh-id-test \
124+
--preserve-hosts always --keyfile "${SSH_KEY}" \
123125
--pre-suite pre-suite/configure_type_defaults.rb \
124126
--tests tests
125127
# The provision step is still needed here, see notes in the

0 commit comments

Comments
 (0)