- Add executable permission to clone_repos.sh and run_tests.sh
- Removed AWS tests temporarily from run_tests.sh as they are failing with credential error. - Removed check from run_tests.sh which was used to run tests on devstack setup. - Fixed LOG statement bug for Cinder driver - Fixed Nova braces bug for Nova tests Closes-Bug: #1704124 Change-Id: Id94e44e848555bf6a96b9ef0b0c276579169987c
This commit is contained in:
parent
e881c18880
commit
f2c95ee757
|
@ -33,7 +33,7 @@ class GceDriver(BaseVD):
|
|||
def do_setup(self, context):
|
||||
self.gce_svc = gceutils.get_gce_service(self.gce_svc_key)
|
||||
self.set_initialized()
|
||||
LOG.info("Gce volume driver init with %s project, %s zone",
|
||||
LOG.info("Gce volume driver init with %s project, %s zone" %
|
||||
(self.gce_project, self.gce_zone))
|
||||
|
||||
def _gce_volume_name(self, volume):
|
||||
|
|
|
@ -62,7 +62,7 @@ class GCENovaTestCase(test.TestCase):
|
|||
mock_get_metadata.side_effect = gce_mock.get_instances_metadata_key
|
||||
instances_list = self._driver.list_instance_uuids()
|
||||
self.assertTrue(isinstance(instances_list, list))
|
||||
self.assertEqual(2, len(instances_list)
|
||||
self.assertEqual(2, len(instances_list))
|
||||
|
||||
@mock.patch('nova.virt.gce.driver.gceutils.set_instance_metadata')
|
||||
@mock.patch('nova.virt.gce.driver.gceutils.get_instance')
|
||||
|
|
|
@ -20,12 +20,6 @@ case $key in
|
|||
-wj) JENKINSRUN=false;;
|
||||
esac
|
||||
|
||||
if [ "$JENKINSRUN" = true ]; then
|
||||
export OMNI_DIR="$BASE/new/omni"
|
||||
sudo chown -R jenkins:stack $OMNI_DIR
|
||||
cd $OMNI_DIR
|
||||
fi
|
||||
|
||||
WORKSPACE=$(pwd)
|
||||
DIRECTORY="$WORKSPACE/openstack"
|
||||
GCE_TEST="test_gce"
|
||||
|
@ -87,8 +81,8 @@ copy_glance_files
|
|||
copy_neutron_files
|
||||
|
||||
echo "============Running tests============"
|
||||
run_tests cinder "$GCE_TEST $AWS_TEST" &
|
||||
run_tests nova "$GCE_TEST $AWS_TEST" &
|
||||
run_tests cinder "$GCE_TEST" &
|
||||
run_tests nova "$GCE_TEST" &
|
||||
run_tests glance_store "$GCE_TEST" &
|
||||
run_tests neutron "$GCE_TEST" &
|
||||
wait
|
||||
|
|
Loading…
Reference in New Issue