Merge "Fix image_name retrieval in custom-image jobs" into stable/rocky
This commit is contained in:
commit
2ece72551e
|
@ -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
|
||||
|
|
|
@ -47,9 +47,8 @@
|
|||
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 PROJECTS="openstack/manila-image-elements $PROJECTS"
|
||||
|
||||
export ENABLED_SERVICES=tempest
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
|
@ -57,20 +56,17 @@
|
|||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
function pre_test_hook {
|
||||
# Build custom image if needed
|
||||
if [[ container_with_custom_image == *"_with_custom_image" ]]; then
|
||||
current_dir=$(pwd)
|
||||
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"
|
||||
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
|
||||
# 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
|
||||
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
|
||||
# Return back to execution dir
|
||||
cd $current_dir
|
||||
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
# defines mode of a share driver. Boolean-like.
|
||||
|
|
|
@ -46,10 +46,6 @@
|
|||
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
|
||||
|
@ -57,21 +53,6 @@
|
|||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
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.
|
||||
|
|
|
@ -47,9 +47,8 @@
|
|||
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 PROJECTS="openstack/manila-image-elements $PROJECTS"
|
||||
|
||||
export ENABLED_SERVICES=tempest
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
|
@ -57,20 +56,17 @@
|
|||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
function pre_test_hook {
|
||||
# Build custom image if needed
|
||||
if [[ generic_with_custom_image == *"_with_custom_image" ]]; then
|
||||
current_dir=$(pwd)
|
||||
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"
|
||||
export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
|
||||
# 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
|
||||
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
|
||||
# Return back to execution dir
|
||||
cd $current_dir
|
||||
|
||||
# 'dhss' - acronym for 'Driver Handles Share Servers',
|
||||
# defines mode of a share driver. Boolean-like.
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
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
|
||||
|
@ -56,21 +52,6 @@
|
|||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
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.
|
||||
|
|
|
@ -46,10 +46,6 @@
|
|||
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
|
||||
|
@ -57,21 +53,6 @@
|
|||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
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.
|
||||
|
|
|
@ -46,10 +46,6 @@
|
|||
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
|
||||
|
@ -57,21 +53,6 @@
|
|||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
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.
|
||||
|
|
|
@ -46,10 +46,6 @@
|
|||
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
|
||||
|
@ -57,21 +53,6 @@
|
|||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
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.
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
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
|
||||
|
@ -56,21 +52,6 @@
|
|||
export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
|
||||
|
||||
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.
|
||||
|
|
Loading…
Reference in New Issue