diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-01 02:29:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-01 02:29:36 +0000 |
| commit | b5e7c20bd893b2abf816ea432437607de00fe5a0 (patch) | |
| tree | a1dcf4fc08a17d482cf5b5fbdceaf56a8524062d | |
| parent | 5c87121819a7db3148abf9c1528d121b2a755f68 (diff) | |
| parent | fd292c9fea3de6e8f53fdbeffd348987359f4193 (diff) | |
| download | trove-integration-b5e7c20bd893b2abf816ea432437607de00fe5a0.tar.gz | |
Merge "Added enum to elements and admin_alt_demo to tests"
| -rw-r--r-- | scripts/conf/test_begin.conf | 9 | ||||
| -rw-r--r-- | scripts/files/requirements/fedora-requirements-default.txt | 1 | ||||
| -rw-r--r-- | scripts/files/requirements/ubuntu-requirements-default.txt | 1 | ||||
| -rwxr-xr-x | scripts/redstack | 11 |
4 files changed, 17 insertions, 5 deletions
diff --git a/scripts/conf/test_begin.conf b/scripts/conf/test_begin.conf index ceb8f02..3543799 100644 --- a/scripts/conf/test_begin.conf +++ b/scripts/conf/test_begin.conf @@ -64,6 +64,15 @@ "services": ["trove"] } }, + { "auth_user":"admin_alt_demo", + "auth_key":"%admin_password%", + "tenant":"alt_demo", + "tenant_id":"%alt_demo_tenant_id%", + "requirements": { + "is_admin":true, + "services": ["swift"] + } + }, { "auth_user":"demo", "auth_key":"%admin_password%", "tenant":"demo", diff --git a/scripts/files/requirements/fedora-requirements-default.txt b/scripts/files/requirements/fedora-requirements-default.txt index 82ff409..8888745 100644 --- a/scripts/files/requirements/fedora-requirements-default.txt +++ b/scripts/files/requirements/fedora-requirements-default.txt @@ -24,3 +24,4 @@ oslo.log>=1.8.0 # Apache-2.0 osprofiler>=0.3.0 oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 pexpect>=3.1,!=3.3 +enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD diff --git a/scripts/files/requirements/ubuntu-requirements-default.txt b/scripts/files/requirements/ubuntu-requirements-default.txt index b094e2f..72795a7 100644 --- a/scripts/files/requirements/ubuntu-requirements-default.txt +++ b/scripts/files/requirements/ubuntu-requirements-default.txt @@ -23,3 +23,4 @@ oslo.service>=0.1.0 # Apache-2.0 oslo.utils>=1.1.0 osprofiler>=0.3.0 oslo.concurrency>=0.3.0 +enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD diff --git a/scripts/redstack b/scripts/redstack index 68d2356..6161d50 100755 --- a/scripts/redstack +++ b/scripts/redstack @@ -1091,10 +1091,11 @@ function cmd_kick_start() { function cmd_dsvm_gate_tests() { DATASTORE_TYPE=${1:-'mysql'} - HOST_SCP_USERNAME=${2:-'jenkins'} - GUEST_USERNAME=${3:-'ubuntu'} - NETWORK_GATEWAY=${4:-'10.1.0.1'} - ESCAPED_PATH_TROVE=${5:-'\/opt\/stack\/new\/trove'} + TEST_GROUP=${2:-${DATASTORE_TYPE}} + HOST_SCP_USERNAME=${3:-'jenkins'} + GUEST_USERNAME=${4:-'ubuntu'} + NETWORK_GATEWAY=${5:-'10.1.0.1'} + ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'} if [[ $BRANCH_OVERRIDE == "stable/liberty" || $BRANCH_OVERRIDE == "stable/liberty" ]]; then # Devstack in liberty doesn't copy the clouds.yaml file to /etc so we need to @@ -1136,7 +1137,7 @@ function cmd_dsvm_gate_tests() { echo $SWIFT_ENDPOINTS | xargs -n 1 openstack endpoint delete $OS_CLIENT_ARGS fi - cmd_int_tests --group=$DATASTORE_TYPE + cmd_int_tests --group=$TEST_GROUP } function cmd_reset_task() { |