Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tempest][Tobiko] clouds.yaml mounted on the proper path #123

Closed
wants to merge 1 commit into from
Closed

[Tempest][Tobiko] clouds.yaml mounted on the proper path #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion container-images/tcib/base/os/tempest/run_tempest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ function generate_test_results {

export OS_CLOUD=default

if [ ! -z ${USE_EXTERNAL_FILES} ]; then
if [ ! -z ${USE_EXTERNAL_FILES} ] && [ ! -f $HOME/.config/openstack/clouds.yaml ]; then
mkdir -p $HOME/.config/openstack
cp ${TEMPEST_PATH}clouds.yaml $HOME/.config/openstack/clouds.yaml
fi
Expand Down
10 changes: 7 additions & 3 deletions container-images/tcib/base/os/tobiko/run_tobiko.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#!/bin/sh

set -x

TOBIKO_DIR=/var/lib/tobiko

# assert mandatory variables have been set
[ -z ${TOBIKO_TESTENV} ] && echo "TOBIKO_TESTENV not set" && exit 1

# download Ubuntu minimal image used by the Tobiko scenario tests, if needed
if [ ! -z ${TOBIKO_UBUNTU_MINIMAL_IMAGE_URL} ]; then
if [ ! -z ${TOBIKO_UBUNTU_MINIMAL_IMAGE_URL} ] && [ ! -f ${TOBIKO_DIR}/.downloaded-images/ubuntu-minimal ]; then
mkdir -p ${TOBIKO_DIR}/.downloaded-images
curl ${TOBIKO_UBUNTU_MINIMAL_IMAGE_URL} -o ${TOBIKO_DIR}/.downloaded-images/ubuntu-minimal
fi
Expand All @@ -30,8 +32,10 @@ git checkout ${TOBIKO_VERSION}

# obtain clouds.yaml, id_ecdsa and tobiko.conf from external_files directory
if [ ! -z ${USE_EXTERNAL_FILES} ]; then
mkdir -p $TOBIKO_DIR/.config/openstack
cp $TOBIKO_DIR/external_files/clouds.yaml $TOBIKO_DIR/.config/openstack/
if [ ! -f $TOBIKO_DIR/.config/openstack/clouds.yaml ]; then
mkdir -p $TOBIKO_DIR/.config/openstack
cp $TOBIKO_DIR/external_files/clouds.yaml $TOBIKO_DIR/.config/openstack/
fi
mkdir -p $TOBIKO_DIR/.ssh
cp $TOBIKO_DIR/external_files/id_ecdsa* $TOBIKO_DIR/.ssh/
cp $TOBIKO_DIR/external_files/tobiko.conf .
Expand Down