From 86f0ace357a58daecd70e1fa9eacb9e73051fb6e Mon Sep 17 00:00:00 2001 From: Lingxian Kong Date: Mon, 23 Sep 2019 22:23:13 +1200 Subject: [PATCH] Fix Trove periodic job Change-Id: Iaa6b7e04ab3882d426b8943591fc9189243d69c0 --- doc/source/admin/trovestack.rst | 2 +- playbooks/image-build/post.yaml | 4 +--- playbooks/image-build/run.yaml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/source/admin/trovestack.rst b/doc/source/admin/trovestack.rst index 19f36977da..8cad60f032 100644 --- a/doc/source/admin/trovestack.rst +++ b/doc/source/admin/trovestack.rst @@ -54,7 +54,7 @@ The trove guest agent image could be created by running the following command: guest_os_release=xenial dev_mode=true guest_username=ubuntu - imagepath=$HOME/images/trove-${guest_os}-${guest_os_release}-${datastore_type}.qcow2 + imagepath=$HOME/images/trove-${guest_os}-${guest_os_release}-${datastore_type} * ``dev_mode=true`` is mainly for testing purpose for trove developers and it's necessary to build the image on the trove controller host, because the host diff --git a/playbooks/image-build/post.yaml b/playbooks/image-build/post.yaml index bebd79fb2b..d993a0588d 100644 --- a/playbooks/image-build/post.yaml +++ b/playbooks/image-build/post.yaml @@ -7,6 +7,4 @@ mode: pull verify_host: true rsync_opts: - - --include="trove-*.qcow2" - - --exclude=* - - --prune-empty-dirs + - "--exclude=/*/*/" diff --git a/playbooks/image-build/run.yaml b/playbooks/image-build/run.yaml index c5ca0fa9d8..2c8e0fbbdf 100644 --- a/playbooks/image-build/run.yaml +++ b/playbooks/image-build/run.yaml @@ -12,7 +12,7 @@ {{ guest_os_release }} \ false \ {{ guest_username }} \ - {{ ansible_user_dir }}/images/trove-{{ zuul.branch }}-{{ datastore_type }}-{{ guest_os }}-{{ guest_os_release }}.qcow2 + {{ ansible_user_dir }}/images/trove-{{ zuul.branch }}-{{ datastore_type }}-{{ guest_os }}-{{ guest_os_release }} args: chdir: "{{ ansible_user_dir }}/src/opendev.org/openstack/trove/integration/scripts" tags: