diff options
author | wu.chunyang <wuchunyang@yovole.com> | 2022-04-10 19:42:47 +0800 |
---|---|---|
committer | wu.chunyang <wuchunyang@yovole.com> | 2022-04-13 22:51:20 +0800 |
commit | c0ad3f8c64923b1750602ad827fe1e2f50a9068b (patch) | |
tree | 0feada85f53d6c4be58f1894e7db3dfe7f24dfee | |
parent | 92471bd4f39a0805bd1cbd732fa12d530e607c8f (diff) | |
download | trove-c0ad3f8c64923b1750602ad827fe1e2f50a9068b.tar.gz |
WIP: add guest image build check
This PR adds trove-guest-image-build check in ci.
Change-Id: If512cb7c094d14850555215d412b8e7b418c35ce
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | integration/scripts/functions_qemu | 2 | ||||
-rw-r--r-- | zuul.d/jobs.yaml (renamed from .zuul.yaml) | 70 | ||||
-rw-r--r-- | zuul.d/nodesets.yaml | 15 | ||||
-rw-r--r-- | zuul.d/projects.yaml | 42 |
5 files changed, 81 insertions, 51 deletions
@@ -24,6 +24,9 @@ trove.iml .pid .stestr/ +# Files generated by JetBrains +.idea/ + # Sphinx doc/build/* doc/source/api/* diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu index eef67356..fa120278 100644 --- a/integration/scripts/functions_qemu +++ b/integration/scripts/functions_qemu @@ -59,7 +59,7 @@ function build_guest_image() { elementes="$elementes ubuntu-minimal" fi - export DIB_CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"ConfigDrive"} + export DIB_CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"ConfigDrive, OpenStack"} elementes="$elementes cloud-init-datasources" elementes="$elementes pip-cache" diff --git a/.zuul.yaml b/zuul.d/jobs.yaml index 5df92971..2decd526 100644 --- a/.zuul.yaml +++ b/zuul.d/jobs.yaml @@ -1,53 +1,3 @@ -- nodeset: - name: trove-ubuntu-focal - nodes: - - name: controller - label: nested-virt-ubuntu-focal - groups: - - name: tempest - nodes: - - controller - -- project: - templates: - - check-requirements - - openstack-cover-jobs - # - openstack-lower-constraints-jobs - - openstack-python3-zed-jobs - - periodic-stable-jobs - - publish-openstack-docs-pti - - release-notes-jobs-python3 - check: - jobs: - - openstack-tox-cover: - voting: false - - trove-tox-bandit-baseline: - voting: false - - trove-tempest: - voting: false - - trove-tempest-postgres: - voting: false - - trove-tempest-ipv6-only: - voting: false - - trove-functional-mysql: - voting: false - gate: - queue: trove - jobs: - - trove-tempest: - voting: false - experimental: - jobs: - - trove-functional-mysql - - trove-scenario-mysql-single - - trove-scenario-mysql-multi - - trove-scenario-mariadb-single - - trove-scenario-mariadb-multi - periodic: - jobs: - - publish-trove-guest-image-ubuntu-bionic - - publish-trove-guest-image-ubuntu-bionic-dev - - job: name: trove-devstack-base parent: devstack @@ -461,6 +411,26 @@ - openstack/tripleo-image-elements - job: + name: trove-ubuntu-guest-image-build + run: playbooks/image-build/run.yaml + nodeset: trove-ubuntu-focal-single + description: | + Build Ubuntu Bionic based image only on ubuntu distro. + required-projects: + - openstack/diskimage-builder + - openstack/trove + - openstack/tripleo-image-elements + files: + - ^integration/(scripts|tests)/ + vars: + guest_os: ubuntu + guest_os_release: bionic + guest_username: ubuntu + branch: master + dev_mode: false + image_suffix: "" + +- job: name: publish-trove-guest-image-ubuntu-bionic parent: publish-trove-guest-image description: | diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml new file mode 100644 index 00000000..88688f9c --- /dev/null +++ b/zuul.d/nodesets.yaml @@ -0,0 +1,15 @@ +- nodeset: + name: trove-ubuntu-focal + nodes: + - name: controller + label: nested-virt-ubuntu-focal + groups: + - name: tempest + nodes: + - controller + +- nodeset: + name: trove-ubuntu-focal-single + nodes: + - name: primary + label: ubuntu-focal
\ No newline at end of file diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml new file mode 100644 index 00000000..0628d051 --- /dev/null +++ b/zuul.d/projects.yaml @@ -0,0 +1,42 @@ + +- project: + templates: + - check-requirements + - openstack-cover-jobs + # - openstack-lower-constraints-jobs + - openstack-python3-zed-jobs + - periodic-stable-jobs + - publish-openstack-docs-pti + - release-notes-jobs-python3 + check: + jobs: + - openstack-tox-cover: + voting: false + - trove-tox-bandit-baseline: + voting: false + - trove-tempest: + voting: false + - trove-ubuntu-guest-image-build: + voting: true + - trove-tempest-postgres: + voting: false + - trove-tempest-ipv6-only: + voting: false + - trove-functional-mysql: + voting: false + gate: + queue: trove + jobs: + - trove-tempest: + voting: false + experimental: + jobs: + - trove-functional-mysql + - trove-scenario-mysql-single + - trove-scenario-mysql-multi + - trove-scenario-mariadb-single + - trove-scenario-mariadb-multi + periodic: + jobs: + - publish-trove-guest-image-ubuntu-bionic + - publish-trove-guest-image-ubuntu-bionic-dev
\ No newline at end of file |