diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 19 | ||||
| -rwxr-xr-x | ci/test.sh | 19 |
2 files changed, 21 insertions, 17 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 48e15e6b..44914f22 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -1021,9 +1021,9 @@ EOI ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source overcloudrc echo "Keystone Endpoint List:" -keystone endpoint-list +openstack endpoint list echo "Keystone Service List" -keystone service-list +openstack service list cinder quota-show \$(openstack project list | grep admin | awk {'print \$2'}) EOI fi @@ -1041,14 +1041,14 @@ function configure_post_install { source overcloudrc set -o errexit echo "Configuring Neutron external network" -neutron net-create external --router:external=True --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }') -neutron subnet-create --name external-net --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr} +neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') +neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr} echo "Removing swift endpoint and service" -swift_service_id=\$(keystone service-list | grep swift | cut -d ' ' -f 2) -swift_endpoint_id=\$(keystone endpoint-list | grep \$swift_service_id | cut -d ' ' -f 2) -keystone endpoint-delete \$swift_endpoint_id -keystone service-delete \$swift_service_id +swift_service_id=\$(openstack service list | grep swift | cut -d ' ' -f 2) +swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2) +openstack endpoint delete \$swift_endpoint_id +openstack service delete \$swift_service_id EOI echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}" @@ -1127,8 +1127,9 @@ fi EOF done -# Print out the dashboard URL +# Print out the undercloud IP and dashboard URL source stackrc +echo "Undercloud IP: $UNDERCLOUD, please connect by doing 'opnfv-util undercloud'" echo "Overcloud dashboard available at http://\$(heat output-show overcloud PublicVip | sed 's/"//g')/dashboard" EOI @@ -10,19 +10,22 @@ set -e -# Make sure python is installed -if ! rpm -q python34-devel > /dev/null; then - sudo yum install -y epel-release - if ! sudo yum install -y python34-devel; then - echo "Failed to install python34-devel package..." - exit 1 +# Make sure python dependencies are installed +for pkg in epel-release python34-devel python34-nose; do + if ! rpm -q ${pkg} > /dev/null; then + if ! sudo yum install -y ${pkg}; then + echo "Failed to install ${pkg} package..." + exit 1 fi -fi + fi +done # Make sure coverage is installed if ! python3 -c "import coverage" &> /dev/null; then sudo easy_install-3.4 coverage; fi +pushd ../build/ > /dev/null make python-tests +popd > /dev/null pushd ../tests/ > /dev/null percent=$(coverage3 report --include '*lib/python/*' -m | grep TOTAL | tr -s ' ' | awk '{ print $4 }' | cut -d % -f 1) if [[ percent -lt 80 ]]; then @@ -30,4 +33,4 @@ if [[ percent -lt 80 ]]; then echo "Does not meet 80% requirement" exit 1 fi -popd > /dev/nul +popd > /dev/null |