Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
jjb: xci: Use the correct SSH configuration file
[releng.git]
/
jjb
/
xci
/
bifrost-verify.sh
diff --git
a/jjb/xci/bifrost-verify.sh
b/jjb/xci/bifrost-verify.sh
index
a86ba91
..
198f2e1
100755
(executable)
--- a/
jjb/xci/bifrost-verify.sh
+++ b/
jjb/xci/bifrost-verify.sh
@@
-11,15
+11,13
@@
set -o errexit
set -o nounset
set -o pipefail
set -o nounset
set -o pipefail
-git clone https://git.openstack.org/openstack/bifrost $WORKSPACE/bifrost
git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci
git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci
-# checkout the patch
-cd $CLONE_LOCATION
+cd $WORKSPACE
git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
# combine opnfv and upstream scripts/playbooks
git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
# combine opnfv and upstream scripts/playbooks
-/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/
bifrost/
+/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/
cd $WORKSPACE/releng-xci
cat > bifrost_test.sh<<EOF
cd $WORKSPACE/releng-xci
cat > bifrost_test.sh<<EOF
@@
-27,9
+25,6
@@
cd ~/bifrost
# provision 3 VMs; xcimaster, controller, and compute
./scripts/bifrost-provision.sh
# provision 3 VMs; xcimaster, controller, and compute
./scripts/bifrost-provision.sh
-# list the provisioned VMs
-source env-vars
-ironic node-list
sudo -H -E virsh list
EOF
chmod a+x bifrost_test.sh
sudo -H -E virsh list
EOF
chmod a+x bifrost_test.sh
@@
-41,8
+36,11
@@
case ${DISTRO} in
*suse*) VM_DISTRO=opensuse ;;
esac
*suse*) VM_DISTRO=opensuse ;;
esac
+export XCI_BUILD_CLEAN_VM_OS=false
+export XCI_UPDATE_CLEAN_VM_OS=true
+
./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
-rsync -a
$WORKSPACE/releng-xci
${VM_DISTRO}_xci_vm:~/bifrost
+rsync -a
-e "ssh -F $HOME/.ssh/xci-vm-config" $WORKSPACE/
${VM_DISTRO}_xci_vm:~/bifrost
-ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost && ./bifrost_test.sh"
+ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost
/releng-xci
&& ./bifrost_test.sh"