openstack/manila
Code Issues Proposed changes

Fix image_name retrieval in custom-image jobs

Browse Source 
And use a 'file://' url for the custom manila image.

See also https://review.openstack.org/#/c/623330.  These
are interdependent patches but no harm is done by merging
this one first and having 623330 depend on it since retrieval
of the image name is not working correctly anyways.

Partial-Bug: #1807969

Change-Id: Ib3a74d170f159dfbc38b5302f00800f3530f4921
(cherry picked from commit 6299ed5ed0)
(cherry picked from commit 758eaac8cc)
(cherry picked from commit 68f6578adc)
This commit is contained in:
Tom Barron 2018-12-07 12:10:15 -05:00
parent 6fa660c4de
commit 65a64521fe
9 changed files with 26 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ci/pre_test_hook.sh
View File

@ -162,6 +162,10 @@ elif [[ "$DRIVER" == "container"* ]]; then
fi
echo "MANILA_SERVICE_IMAGE_ENABLED=$MANILA_SERVICE_IMAGE_ENABLED" >> $localconf
if [[ "$MANILA_SERVICE_IMAGE_ENABLED" == True ]]; then
echo "MANILA_SERVICE_IMAGE_URL=$MANILA_SERVICE_IMAGE_URL" >> $localconf
echo "MANILA_SERVICE_IMAGE_NAME=$MANILA_SERVICE_IMAGE_NAME" >> $localconf
fi
echo "MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS=$DEFAULT_EXTRA_SPECS" >> $localconf
# Enabling isolated metadata in Neutron is required because

12
playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
View File

@ -47,29 +47,25 @@
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Install manila-image-elements project for building custom image
if [[ container_with_custom_image == *"_with_custom_image" ]]; then
export PROJECTS="openstack/manila-image-elements $PROJECTS"
fi
export ENABLED_SERVICES=tempest
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Build custom image if needed
if [[ container_with_custom_image == *"_with_custom_image" ]]; then
current_dir=$(pwd)
# Go to 'manila-image-elements' dir, build image and get its name
cd /opt/stack/new/manila-image-elements
./tools/gate/build-images container_with_custom_image True
image_name=$(git ls-files --others --exclude-standard)
export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
./tools/gate/build-images container_with_custom_image
image_name=$(cat ./IMAGE_NAME)
export MANILA_SERVICE_IMAGE_URL="file://$(pwd)/$image_name"
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
# Return back to execution dir
cd $current_dir
fi
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.

19
playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
View File

@ -46,31 +46,12 @@
export DEVSTACK_GATE_POSTGRES=0
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Install manila-image-elements project for building custom image
if [[ generic == *"_with_custom_image" ]]; then
export PROJECTS="openstack/manila-image-elements $PROJECTS"
fi
export ENABLED_SERVICES=tempest
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Build custom image if needed
if [[ generic == *"_with_custom_image" ]]; then
current_dir=$(pwd)
# Go to 'manila-image-elements' dir, build image and get its name
cd /opt/stack/new/manila-image-elements
./tools/gate/build-images generic True
image_name=$(git ls-files --others --exclude-standard)
export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
# Return back to execution dir
cd $current_dir
fi
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.
# 'driver' - codename of a share driver to configure.

12
playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
View File

@ -47,29 +47,25 @@
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Install manila-image-elements project for building custom image
if [[ generic_with_custom_image == *"_with_custom_image" ]]; then
export PROJECTS="openstack/manila-image-elements $PROJECTS"
fi
export ENABLED_SERVICES=tempest
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Build custom image if needed
if [[ generic_with_custom_image == *"_with_custom_image" ]]; then
current_dir=$(pwd)
# Go to 'manila-image-elements' dir, build image and get its name
cd /opt/stack/new/manila-image-elements
./tools/gate/build-images generic_with_custom_image True
image_name=$(git ls-files --others --exclude-standard)
export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
./tools/gate/build-images generic_with_custom_image
image_name=$(cat ./IMAGE_NAME)
export MANILA_SERVICE_IMAGE_URL="file://$(pwd)/$image_name"
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
# Return back to execution dir
cd $current_dir
fi
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.

19
playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
View File

@ -45,31 +45,12 @@
export DEVSTACK_GATE_POSTGRES=0
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Install manila-image-elements project for building custom image
if [[ generic == *"_with_custom_image" ]]; then
export PROJECTS="openstack/manila-image-elements $PROJECTS"
fi
export ENABLED_SERVICES=tempest
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Build custom image if needed
if [[ generic == *"_with_custom_image" ]]; then
current_dir=$(pwd)
# Go to 'manila-image-elements' dir, build image and get its name
cd /opt/stack/new/manila-image-elements
./tools/gate/build-images generic True
image_name=$(git ls-files --others --exclude-standard)
export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
# Return back to execution dir
cd $current_dir
fi
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.
# 'driver' - codename of a share driver to configure.

19
playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
View File

@ -46,31 +46,12 @@
export DEVSTACK_GATE_POSTGRES=1
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Install manila-image-elements project for building custom image
if [[ container == *"_with_custom_image" ]]; then
export PROJECTS="openstack/manila-image-elements $PROJECTS"
fi
export ENABLED_SERVICES=tempest
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Build custom image if needed
if [[ container == *"_with_custom_image" ]]; then
current_dir=$(pwd)
# Go to 'manila-image-elements' dir, build image and get its name
cd /opt/stack/new/manila-image-elements
./tools/gate/build-images container True
image_name=$(git ls-files --others --exclude-standard)
export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
# Return back to execution dir
cd $current_dir
fi
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.
# 'driver' - codename of a share driver to configure.

19
playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
View File

@ -46,31 +46,12 @@
export DEVSTACK_GATE_POSTGRES=1
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Install manila-image-elements project for building custom image
if [[ generic == *"_with_custom_image" ]]; then
export PROJECTS="openstack/manila-image-elements $PROJECTS"
fi
export ENABLED_SERVICES=tempest
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Build custom image if needed
if [[ generic == *"_with_custom_image" ]]; then
current_dir=$(pwd)
# Go to 'manila-image-elements' dir, build image and get its name
cd /opt/stack/new/manila-image-elements
./tools/gate/build-images generic True
image_name=$(git ls-files --others --exclude-standard)
export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
# Return back to execution dir
cd $current_dir
fi
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.
# 'driver' - codename of a share driver to configure.

19
playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
View File

@ -46,31 +46,12 @@
export DEVSTACK_GATE_POSTGRES=1
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Install manila-image-elements project for building custom image
if [[ zfsonlinux == *"_with_custom_image" ]]; then
export PROJECTS="openstack/manila-image-elements $PROJECTS"
fi
export ENABLED_SERVICES=tempest
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Build custom image if needed
if [[ zfsonlinux == *"_with_custom_image" ]]; then
current_dir=$(pwd)
# Go to 'manila-image-elements' dir, build image and get its name
cd /opt/stack/new/manila-image-elements
./tools/gate/build-images zfsonlinux True
image_name=$(git ls-files --others --exclude-standard)
export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
# Return back to execution dir
cd $current_dir
fi
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.
# 'driver' - codename of a share driver to configure.

19
playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
View File

@ -45,31 +45,12 @@
export DEVSTACK_GATE_POSTGRES=0
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Install manila-image-elements project for building custom image
if [[ generic == *"_with_custom_image" ]]; then
export PROJECTS="openstack/manila-image-elements $PROJECTS"
fi
export ENABLED_SERVICES=tempest
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {
# Build custom image if needed
if [[ generic == *"_with_custom_image" ]]; then
current_dir=$(pwd)
# Go to 'manila-image-elements' dir, build image and get its name
cd /opt/stack/new/manila-image-elements
./tools/gate/build-images generic True
image_name=$(git ls-files --others --exclude-standard)
export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
# Return back to execution dir
cd $current_dir
fi
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.
# 'driver' - codename of a share driver to configure.