Set packages_service for murano tests

Set dashboard tests config variable packages_service to allow tests to
find which backend they are using.

Renames PACKAGE_SERVICE to PACKAGES_SERVICE for posterity.

Targets bp: murano-glare-devstack-testing

Change-Id: I6581d9bbdf72424e2520ba1a7ecc25d5861885d9
This commit is contained in:
Kirill Zaitsev 2016-08-30 17:08:32 +03:00
parent 45b44d3996
commit bfa3abf738
3 changed files with 7 additions and 2 deletions

View File

@ -26,7 +26,7 @@
fi
export DISTR_NAME='{distro}'
export PACKAGE_SERVICE='{pkg-service}'
export PACKAGES_SERVICE='{pkg-service}'
if [[ $ZUUL_REF =~ "juno" || $ZUUL_REF =~ "kilo" ]]; then
echo 'Using old CI strategy'

View File

@ -108,7 +108,8 @@ function deploy_devstack() {
DEVSTACK_LOCAL_CONFIG=""
if [[ ${PACKAGE_SERVICE} = "-glare" ]]; then
# remove leading '-' from '-glare'
if [[ ${PACKAGES_SERVICE:1} = "glare" ]]; then
# NOTE(kzaitsev): we have to install glance to make devstack install glare code
# g-api ensures glance is installed, g-reg ensures cache dirs would be created
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service g-api"

View File

@ -147,11 +147,15 @@ function prepare_tests() {
else
set_config "${section_name}" 'keystone_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
fi
set_config "${section_name}" 'murano_url' "$(shield_slashes http://${FOUND_IP_ADDRESS}:8082/)" "${config_file}"
set_config "${section_name}" 'user' "${ADMIN_USERNAME}" "${config_file}"
set_config "${section_name}" 'password' "${ADMIN_PASSWORD}" "${config_file}"
set_config "${section_name}" 'tenant' "${ADMIN_TENANT}" "${config_file}"
set_config "${section_name}" 'linux_image' "${LINUX_IMAGE}" "${config_file}"
# remove leading '-' from '-glare'
set_config "${section_name}" 'packages_service' "${PACKAGES_SERVICE:1}" "${config_file}"
if [[ ${ZUUL_BRANCH} =~ liberty ]]; then
set_config "${section_name}" 'auth_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v2.0/)" "${config_file}"
else