Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[doctor] drop experimental job (profiler)"
[releng.git]
/
jjb
/
xci
/
bifrost-verify.sh
diff --git
a/jjb/xci/bifrost-verify.sh
b/jjb/xci/bifrost-verify.sh
index
e0c5090
..
14c8d37
100755
(executable)
--- a/
jjb/xci/bifrost-verify.sh
+++ b/
jjb/xci/bifrost-verify.sh
@@
-89,38
+89,38
@@
function cleanup_and_upload() {
}
# check distro to see if we support it
}
# check distro to see if we support it
-if [[ ! "$DISTRO" =~ (
trusty
|centos7|suse) ]]; then
+if [[ ! "$DISTRO" =~ (
xenial
|centos7|suse) ]]; then
echo "Distro $DISTRO is not supported!"
exit 1
fi
# remove previously cloned repos
echo "Distro $DISTRO is not supported!"
exit 1
fi
# remove previously cloned repos
-sudo /bin/rm -rf /opt/bifrost /opt/stack /opt/releng
+/bin/rm -rf $WORKSPACE/bifrost $WORKSPACE/releng-xci
# Fix up permissions
fix_ownership
# clone all the repos first and checkout the patch afterwards
# Fix up permissions
fix_ownership
# clone all the repos first and checkout the patch afterwards
-
sudo git clone https://git.openstack.org/openstack/bifrost /opt
/bifrost
-sudo git clone https://gerrit.opnfv.org/gerrit/releng /opt/releng
+
git clone https://git.openstack.org/openstack/bifrost $WORKSPACE
/bifrost
+git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci
# checkout the patch
cd $CLONE_LOCATION
# checkout the patch
cd $CLONE_LOCATION
-
sudo
git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
+git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
# combine opnfv and upstream scripts/playbooks
# combine opnfv and upstream scripts/playbooks
-
sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt
/bifrost/
+
/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE
/bifrost/
# cleanup remnants of previous deployment
# cleanup remnants of previous deployment
-cd
/opt
/bifrost
-sudo -E ./scripts/destroy-env.sh
+cd
$WORKSPACE
/bifrost
+sudo -
H -
E ./scripts/destroy-env.sh
-# provision 3 VMs;
jumphost
, controller, and compute
-cd
/opt
/bifrost
-
sudo -E ./scripts/test-bifrost-deployment
.sh
+# provision 3 VMs;
xcimaster
, controller, and compute
+cd
$WORKSPACE
/bifrost
+
./scripts/bifrost-provision
.sh
# list the provisioned VMs
# list the provisioned VMs
-cd
/opt
/bifrost
+cd
$WORKSPACE
/bifrost
source env-vars
ironic node-list
source env-vars
ironic node-list
-virsh list
+
sudo -H -E
virsh list