summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2015-12-17 14:39:09 +0800
committermeimei <meimei@huawei.com>2015-12-17 14:39:09 +0800
commita2c1087761be5f8b3fa792f11b52615165b58ec5 (patch)
treea328c6b908981675f4dc5a8ae0c322760498caf4 /jjb
parent5fbd8ce61c14a31863769c6e679ec4e5b5809e7a (diff)
[compass]bugfix: wrong parameter name
we cannot use '-' in parameter-name Change-Id: Ie5e9ff31e0f21cc1033de646b81a66164524b291 Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass4nfv.yml14
1 files changed, 8 insertions, 6 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 952a01b37..3645bbba3 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -316,12 +316,12 @@
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
- choice:
- name: COMPASS-OPENSTACK-VERSION
+ name: COMPASS_OPENSTACK_VERSION
choices:
- 'liberty'
- 'juno'
- choice:
- name: COMPASS-OS-VERSION
+ name: COMPASS_OS_VERSION
choices:
- 'ubuntu-trusty'
- 'rhel7'
@@ -415,6 +415,8 @@
export EXTERNAL_NIC=vnic_ci
cd $WORKSPACE
+ export OS_VERSION=${COMPASS_OS_VERSION}
+ export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
./deploy.sh $FLAVOR_CONF
if [ $? -ne 0 ]; then
echo "depolyment failed!"
@@ -426,7 +428,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_${COMPASS-OPENSTACK-VERSION}-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
@@ -449,8 +451,8 @@
cd $WORKSPACE
- export OS_VERSION=${COMPASS-OS-VERSION}
- export OPENSTACK_VERSION=${COMPASS-OPENSTACK-VERSION}
+ 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!"
@@ -462,7 +464,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_${COMPASS-OPENSTACK-VERSION}-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