File tree Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change 6969 with :
7070 fetch-depth : 0
7171 - id : vm-cluster
72- uses : jpartlow/kvm_automation_tooling@main
72+ uses : jpartlow/nested_vms@v1
7373 with :
7474 os : ${{ matrix.os[0] }}
7575 os-version : ${{ matrix.os[1] }}
@@ -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
You can’t perform that action at this time.
0 commit comments