diff options
| author |   meimei <meimei@huawei.com> | 2015-12-16 15:46:56 +0800 |
|---|---|---|
| committer | mei mei <meimei@huawei.com> | 2015-12-16 07:52:57 +0000 |
| commit | cefea534d8ec3e0f01b8357c6296417ab378c685 (patch) | |
| tree | 9d5cd43d7cfa03b8545ff34d74707d61203093fa | |
| parent | 7baae6ff718e3f545074b9ae9e4f9a36b0a6ca1b (diff) | |
[compass] switch openstack version to liberty
JIRA: COMPASS-204
Change-Id: Id96c6a827e309834a9deea596c5403a50c7f055c
Signed-off-by: meimei <meimei@huawei.com>
| -rw-r--r-- | jjb/compass4nfv/compass4nfv.yml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 1a0a6f746..3ef252fdc 100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -315,6 +315,16 @@ - 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 @@ -439,6 +449,8 @@ 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!" @@ -450,7 +462,7 @@ 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 |