From 6299ed5ed001ae2768ed2b954730b526b4053b2c Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Fri, 7 Dec 2018 12:10:15 -0500 Subject: [PATCH] Fix image_name retrieval in custom-image jobs 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 --- contrib/ci/pre_test_hook.sh | 4 +++ .../run.yaml | 26 ++++++++----------- .../run.yaml | 19 -------------- .../run.yaml | 26 ++++++++----------- .../run.yaml | 19 -------------- .../run.yaml | 19 -------------- .../run.yaml | 19 -------------- .../run.yaml | 19 -------------- .../manila-tempest-dsvm-scenario/run.yaml | 19 -------------- 9 files changed, 26 insertions(+), 144 deletions(-) diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index 1ae53e1e4e..55dd3d002f 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -168,6 +168,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 echo "MANILA_CONFIGURE_DEFAULT_TYPES=${MANILA_CONFIGURE_DEFAULT_TYPES:-True}" >> $localconf diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml index 08c931eba1..4af2ce35d5 100644 --- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml @@ -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. diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml index b2be8cc7f7..074def09c7 100644 --- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml @@ -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. diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml index 0f287d214d..42142520e9 100644 --- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml @@ -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. diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml index 87b2f843be..092d8ce37b 100644 --- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml @@ -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. diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml index c503bff907..7960cdd9c3 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml @@ -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. diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml index 5922c1e4c3..0fed596fda 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml @@ -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. diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml index ffd078d505..8153557cc4 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml @@ -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. diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml index eb687c6dc8..73e63108ff 100644 --- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml @@ -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.