openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fix rally deployment config to rally 1.3.0"

Browse Source
This commit is contained in:
Zuul 2019-01-09 06:16:01 +00:00 committed by Gerrit Code Review
commit f743caa254
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
helm-toolkit/templates/scripts/_rally_test.sh.tpl
View File

@ -22,21 +22,32 @@ set -ex
: "${RALLY_ENV_NAME:="openstack-helm"}" : "${RALLY_ENV_NAME:="openstack-helm"}"
: "${OS_INTERFACE:="public"}" : "${OS_INTERFACE:="public"}"
rally-manage db create function create_or_update_db () {
revisionResults=$(rally db revision)
if [ $revisionResults = "None" ]
then
rally db create
else
rally db upgrade
fi
}
create_or_update_db
cat > /tmp/rally-config.json << EOF cat > /tmp/rally-config.json << EOF
{ {
"type": "ExistingCloud", "openstack": {
"auth_url": "${OS_AUTH_URL}", "auth_url": "${OS_AUTH_URL}",
"region_name": "${OS_REGION_NAME}", "region_name": "${OS_REGION_NAME}",
"endpoint_type": "${OS_INTERFACE}", "endpoint_type": "${OS_INTERFACE}",
"admin": { "admin": {
"username": "${OS_USERNAME}", "username": "${OS_USERNAME}",
"password": "${OS_PASSWORD}", "password": "${OS_PASSWORD}",
"project_name": "${OS_PROJECT_NAME}", "user_domain_name": "${OS_USER_DOMAIN_NAME}",
"user_domain_name": "${OS_USER_DOMAIN_NAME}", "project_name": "${OS_PROJECT_NAME}",
"project_domain_name": "${OS_PROJECT_DOMAIN_NAME}" "project_domain_name": "${OS_PROJECT_DOMAIN_NAME}"
}, },
"users": [ "users": [
{ {
"username": "${SERVICE_OS_USERNAME}", "username": "${SERVICE_OS_USERNAME}",
"password": "${SERVICE_OS_PASSWORD}", "password": "${SERVICE_OS_PASSWORD}",
@ -44,7 +55,9 @@ cat > /tmp/rally-config.json << EOF
"user_domain_name": "${SERVICE_OS_USER_DOMAIN_NAME}", "user_domain_name": "${SERVICE_OS_USER_DOMAIN_NAME}",
"project_domain_name": "${SERVICE_OS_PROJECT_DOMAIN_NAME}" "project_domain_name": "${SERVICE_OS_PROJECT_DOMAIN_NAME}"
} }
] "https_insecure": false,
"https_cacert": ""
}
} }
EOF EOF
rally deployment create --file /tmp/rally-config.json --name "${RALLY_ENV_NAME}" rally deployment create --file /tmp/rally-config.json --name "${RALLY_ENV_NAME}"
@ -59,6 +72,6 @@ rally verify delete-verifier --id "${RALLY_ENV_NAME}-tempest" --force
{{- end }} {{- end }}
rally task validate /etc/rally/rally_tests.yaml rally task validate /etc/rally/rally_tests.yaml
rally task start /etc/rally/rally_tests.yaml rally task start /etc/rally/rally_tests.yaml
rally deployment destroy --deployment "${RALLY_ENV_NAME}"
rally task sla-check rally task sla-check
rally deployment destroy --deployment "${RALLY_ENV_NAME}"
{{- end }} {{- end }}