diff options
| -rwxr-xr-x | docker/prepare_env.sh | 5 | ||||
| -rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index 4f1751baa..4106e3bde 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -184,6 +184,11 @@ if [ ${RALLY_COMMIT} != "latest" ]; then git reset --hard ${RALLY_COMMIT} fi +# IMPORTANT: To be removed when version 0.2.1 is out +git config --global user.email "functest@opnfv.com" +git config --global user.name "opnfv/functest" +git fetch https://review.openstack.org/openstack/rally refs/changes/06/270506/9 && git cherry-pick FETCH_HEAD + # Create directories mkdir -p ${FUNCTEST_CONF_DIR} diff --git a/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml b/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml index c8ec15222..8aeddc37c 100644 --- a/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml +++ b/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml @@ -1,6 +1,6 @@ fuel: images: ['TestVM'] - networks: ['net04', 'net04_ext'] + networks: ['net04', 'net04_ext', 'admin_floating'] routers: ['router04'] security_groups: ['default'] tenants: ['admin', 'services'] @@ -28,4 +28,4 @@ joid: users: ['admin', 'glance', 'nova', 'neutron', 'heat-cfn_heat', 'ceilometer', 'cinder_cinderv2', 'swift'] common: networks: ['functest-net'] - routers: ['functest-router'] + routers: ['functest-router']
\ No newline at end of file |