diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-20 01:35:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-20 01:35:54 +0000 |
| commit | 560857232af665d49ab030920d9cc7872ccadbd8 (patch) | |
| tree | af43718be463e5f1b9bdb6466ddca5c149f8aadd | |
| parent | 8fbe6d88e016141b0a5043c26de84b3462103304 (diff) | |
| parent | 08f0c9767543728cb49bc40d38a46342622f9ef0 (diff) | |
| download | trove-560857232af665d49ab030920d9cc7872ccadbd8.tar.gz | |
Merge "Support to build dev datastore image in CI job" into stable/train
| -rw-r--r-- | .zuul.yaml | 22 | ||||
| -rw-r--r-- | integration/scripts/functions_qemu | 2 | ||||
| -rw-r--r-- | playbooks/image-build/run.yaml | 4 |
3 files changed, 24 insertions, 4 deletions
@@ -59,6 +59,9 @@ - publish-trove-guest-image-mysql-ubuntu-xenial: branches: - stable/train + - publish-trove-guest-image-mysql-ubuntu-xenial-dev: + branches: + - stable/train - job: name: trove-legacy-dsvm-base @@ -364,4 +367,21 @@ guest_os: ubuntu guest_os_release: xenial guest_username: ubuntu - branch: train
\ No newline at end of file + branch: train + dev_mode: false + image_suffix: "" + +- job: + name: publish-trove-guest-image-mysql-ubuntu-xenial-dev + parent: publish-trove-guest-image + description: | + Build and publish Ubuntu Xenial based Trove guest image to + tarballs.openstack.org. + vars: + datastore_type: mysql + guest_os: ubuntu + guest_os_release: xenial + guest_username: ubuntu + branch: train + dev_mode: true + image_suffix: "-dev" diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu index acc62440..635b1451 100644 --- a/integration/scripts/functions_qemu +++ b/integration/scripts/functions_qemu @@ -88,7 +88,7 @@ function build_vm() { popd > /dev/null sudo rm -rf $TEMP - exclaim "Image ${image_output}.${GUEST_IMAGETYPE} was built successfully." + exclaim "Image ${image_output} was built successfully." } function build_guest_image() { diff --git a/playbooks/image-build/run.yaml b/playbooks/image-build/run.yaml index 2037edde..75d57edc 100644 --- a/playbooks/image-build/run.yaml +++ b/playbooks/image-build/run.yaml @@ -10,9 +10,9 @@ {{ datastore_type }} \ {{ guest_os }} \ {{ guest_os_release }} \ - false \ + {{ dev_mode }} \ {{ guest_username }} \ - {{ ansible_user_dir }}/images/trove-{{ branch }}-{{ datastore_type }}-{{ guest_os }}-{{ guest_os_release }} + {{ ansible_user_dir }}/images/trove-{{ branch }}-{{ datastore_type }}-{{ guest_os }}-{{ guest_os_release }}{{ image_suffix }} args: chdir: "{{ ansible_user_dir }}/src/opendev.org/openstack/trove/integration/scripts" tags: |