diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-20 02:02:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-20 02:02:39 +0000 |
| commit | d29051470658bb1bc8ec680bcaa832598e374925 (patch) | |
| tree | ea867e8ba5b4f7158f6ebf606bbfd5037347bbaa | |
| parent | a67a6ed2ef8f8009722f05be8d941ee079646890 (diff) | |
| parent | 757a8739635b14878ff996407708edb215628543 (diff) | |
| download | trove-d29051470658bb1bc8ec680bcaa832598e374925.tar.gz | |
Merge "Some clean up"
| -rw-r--r-- | .zuul.yaml | 2 | ||||
| -rw-r--r-- | integration/scripts/trovestack.rc | 3 | ||||
| -rw-r--r-- | playbooks/image-build/run.yaml | 14 |
3 files changed, 7 insertions, 12 deletions
@@ -44,8 +44,6 @@ - trove-functional-mysql - trove-scenario-mysql-single - trove-scenario-mysql-multi - - trove-tempest-ipv6-only: - voting: false experimental: jobs: - trove-grenade diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc index b97b3813..eaf74550 100644 --- a/integration/scripts/trovestack.rc +++ b/integration/scripts/trovestack.rc @@ -50,8 +50,6 @@ PATH_OPENSTACKCLIENT=$DEST/python-openstackclient PATH_PYTHON_SWIFTCLIENT=$DEST/python-swiftclient PATH_PYTHON_TROVECLIENT=$DEST/python-troveclient PATH_TROVE_DASHBOARD=$DEST/trove-dashboard -PATH_DISKIMAGEBUILDER_ELEMENTS=$(python -c 'import os, diskimage_builder, pkg_resources;print(os.path.abspath(pkg_resources.resource_filename(diskimage_builder.__name__, "elements")))') -PATH_TRIPLEO_ELEMENTS=$DEST/tripleo-image-elements # Save the state of TROVE_BRANCH first, since it's used in trovestack TROVE_BRANCH_ORIG=${TROVE_BRANCH} @@ -91,7 +89,6 @@ SERVICE_PASSWORD=${SERVICE_PASSWORD:-"secretservice"} # Swift hash used by devstack. SWIFT_HASH=12go358snjw24501 - # Swift Disk Image SWIFT_DATA_DIR=${DATA_DIR}/swift SWIFT_DISK_IMAGE=${SWIFT_DATA_DIR}/drives/images/swift.img diff --git a/playbooks/image-build/run.yaml b/playbooks/image-build/run.yaml index 6149f8fe..c5ca0fa9 100644 --- a/playbooks/image-build/run.yaml +++ b/playbooks/image-build/run.yaml @@ -5,13 +5,13 @@ path: '{{ ansible_user_dir }}/images' state: directory - name: Build Trove guest image - shell: > - ./trovestack build-image - {{ datastore_type }} - {{ guest_os }} - {{ guest_os_release }} - false - {{ guest_username }} + shell: >- + ./trovestack build-image \ + {{ datastore_type }} \ + {{ guest_os }} \ + {{ guest_os_release }} \ + false \ + {{ guest_username }} \ {{ ansible_user_dir }}/images/trove-{{ zuul.branch }}-{{ datastore_type }}-{{ guest_os }}-{{ guest_os_release }}.qcow2 args: chdir: "{{ ansible_user_dir }}/src/opendev.org/openstack/trove/integration/scripts" |