Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bugfix: switch openstack version to liberty
[releng.git]
/
jjb
/
compass4nfv
/
compass4nfv.yml
diff --git
a/jjb/compass4nfv/compass4nfv.yml
b/jjb/compass4nfv/compass4nfv.yml
index
1a0a6f7
..
c0c3173
100644
(file)
--- a/
jjb/compass4nfv/compass4nfv.yml
+++ b/
jjb/compass4nfv/compass4nfv.yml
@@
-315,6
+315,16
@@
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
+ - choice:
+ name: COMPASS-OPENSTACK-VERSION
+ choices:
+ - 'liberty'
+ - 'juno'
+ - choice:
+ name: COMPASS-OS-VERSION
+ choices:
+ - 'ubuntu-trusty'
+ - 'rhel7'
########################
# builder macros
########################
# builder macros
@@
-416,7
+426,7
@@
echo "Done!"
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
echo "Done!"
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
- sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_
juno
-opnfv2/ansible.log ./ &> /dev/null
+ sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_
${COMPASS-OPENSTACK-VERSION}
-opnfv2/ansible.log ./ &> /dev/null
exit $deploy_ret
exit $deploy_ret
@@
-439,6
+449,8
@@
cd $WORKSPACE
cd $WORKSPACE
+ export OS_VERSION=${COMPASS-OS-VERSION}
+ export OPENSTACK_VERSION=${COMPASS-OPENSTACK-VERSION}
./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml
if [ $? -ne 0 ]; then
echo "depolyment failed!"
./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml
if [ $? -ne 0 ]; then
echo "depolyment failed!"
@@
-450,7
+462,7
@@
echo "Done!"
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
echo "Done!"
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
- sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_
juno
-opnfv2/ansible.log ./ &> /dev/null
+ sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_
${COMPASS-OPENSTACK-VERSION}
-opnfv2/ansible.log ./ &> /dev/null
exit $deploy_ret
exit $deploy_ret