diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-02-28 19:00:05 +0000 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-02-28 19:00:05 +0000 |
| commit | 8b8ce2b4bf9c76713d20a80cc4075fed357e5390 (patch) | |
| tree | 5a85eea6cb379078ecb0729ab52ba51111a70b43 /jjb/xci | |
| parent | c12552a6ce4ad4b5dd0e47f1c3b57bba49a8363b (diff) | |
xci: Use distro specific ssh config while sshing to xci vms
Change-Id: I231488cd9de58a9051bd289c3d584841e7335417
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci')
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 4 | ||||
| -rw-r--r-- | jjb/xci/osa-periodic-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-deployment.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index d3a37ce8a..9219d0020 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -46,6 +46,6 @@ export XCI_UPDATE_CLEAN_VM_OS=true ./xci/scripts/vm/start-new-vm.sh $VM_DISTRO -rsync -a -e "ssh -F $HOME/.ssh/xci-vm-config" $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost +rsync -a -e "ssh -F $HOME/.ssh/${VM_DISTRO}-xci-vm-config" $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost -ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost/releng-xci && ./bifrost_test.sh" +ssh -F $HOME/.ssh/${VM_DISTRO}-xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost/releng-xci && ./bifrost_test.sh" diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml index 64daa696b..a4d37ae06 100644 --- a/jjb/xci/osa-periodic-jobs.yml +++ b/jjb/xci/osa-periodic-jobs.yml @@ -234,7 +234,7 @@ - shell: | #!/bin/bash - ssh -F $HOME/.ssh/xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh" + ssh -F $HOME/.ssh/${VM_DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh" - builder: diff --git a/jjb/xci/xci-start-deployment.sh b/jjb/xci/xci-start-deployment.sh index cb75b511e..17b6a0aa6 100755 --- a/jjb/xci/xci-start-deployment.sh +++ b/jjb/xci/xci-start-deployment.sh @@ -39,4 +39,4 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT exit 0 fi -ssh -F $HOME/.ssh/xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh" +ssh -F $HOME/.ssh/${VM_DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh" |