summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2019-12-19 11:49:25 +1300
committerLingxian Kong <anlin.kong@gmail.com>2019-12-19 19:02:19 +0000
commit08f0c9767543728cb49bc40d38a46342622f9ef0 (patch)
treebfa98efaaf8919c41722b940e74d2ef192585a00
parent775ec10c4f259f1075aaa761d1e3f6abc5a4c377 (diff)
downloadtrove-08f0c9767543728cb49bc40d38a46342622f9ef0.tar.gz
Support to build dev datastore image in CI job
Change-Id: Ieeba998cb87e79c7085a2836b221087bf11d2768
-rw-r--r--.zuul.yaml22
-rw-r--r--integration/scripts/functions_qemu2
-rw-r--r--playbooks/image-build/run.yaml4
3 files changed, 24 insertions, 4 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 8cbbf5f4..20c663f1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -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: