From 851bcf0814375d1917625c91ee42fe436276e2df Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 18 Apr 2019 07:57:49 -0700 Subject: [PATCH] Add upstream testing and review The masakari charm was missing the gitreview and zuul.yaml files. Change-Id: Idb311534d7dc31aa69ae537d28a31fc53911fa63 --- .gitreview | 4 + .zuul.yaml | 3 + src/test-requirements.txt | 3 +- .../bionic-rocky-pacemaker-remote-ssl.yaml | 9 +- .../bionic-rocky-pacemaker-remote.yaml | 179 ------------------ src/tests/bundles/bionic-rocky.yaml | 169 ----------------- .../bionic-rocky-pacemaker-remote-ssl.yaml.j2 | 4 + src/tests/tests.yaml | 16 +- 8 files changed, 25 insertions(+), 362 deletions(-) create mode 100644 .gitreview create mode 100644 .zuul.yaml delete mode 100644 src/tests/bundles/bionic-rocky-pacemaker-remote.yaml delete mode 100644 src/tests/bundles/bionic-rocky.yaml create mode 100644 src/tests/bundles/overlays/bionic-rocky-pacemaker-remote-ssl.yaml.j2 diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..63ca256 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=openstack/charm-masakari.git diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..7051aee --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,3 @@ +- project: + templates: + - python35-charm-jobs diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 4cbbd86..ae908cc 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -1,2 +1,3 @@ # zaza -git+https://github.com/openstack-charmers/zaza.git#egg=zaza +git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0' +git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack diff --git a/src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml b/src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml index 94f363c..fba2d17 100644 --- a/src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml +++ b/src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml @@ -104,7 +104,7 @@ applications: block-device: "None" glance-api-version: 2 keystone: - charm: cs:~gnuoy/keystone-36 + charm: cs:~openstack-charmers-next/keystone series: bionic num_units: 1 options: @@ -165,7 +165,6 @@ applications: num_units: 3 options: openstack-origin: cloud:bionic-rocky/proposed - vip: 10.5.110.1 ceph-mon: charm: ceph-mon num_units: 3 @@ -180,14 +179,14 @@ applications: cinder-ceph: charm: cinder-ceph masakari-monitors: - charm: cs:~gnuoy/masakari-monitors-5 + charm: cs:~openstack-charmers-next/masakari-monitors hacluster: - charm: cs:~gnuoy/hacluster-28 + charm: cs:~openstack-charmers-next/hacluster options: corosync_transport: unicast cluster_count: 3 pacemaker-remote: - charm: cs:~gnuoy/pacemaker-remote-8 + charm: cs:~openstack-charmers-next/pacemaker-remote options: enable-stonith: False enable-resources: False diff --git a/src/tests/bundles/bionic-rocky-pacemaker-remote.yaml b/src/tests/bundles/bionic-rocky-pacemaker-remote.yaml deleted file mode 100644 index 038b525..0000000 --- a/src/tests/bundles/bionic-rocky-pacemaker-remote.yaml +++ /dev/null @@ -1,179 +0,0 @@ -series: bionic -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp-nova - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - cinder:identity-service - - keystone:identity-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - neutron-api:identity-service - - keystone:identity-service -- - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - cinder:shared-db - - mysql:shared-db -- - neutron-api:shared-db - - mysql:shared-db -- - cinder:amqp - - rabbitmq-server:amqp -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - nova-cloud-controller:neutron-api - - neutron-api:neutron-api -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - masakari:shared-db - - mysql:shared-db -- - masakari:amqp - - rabbitmq-server:amqp -- - masakari:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - ceph-mon:osd - - ceph-osd:mon -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - nova-compute:juju-info - - masakari-monitors:container -- - masakari:ha - - hacluster:ha -- - keystone:identity-credentials - - masakari-monitors:identity-credentials -- - nova-compute:juju-info - - pacemaker-remote:juju-info -- - hacluster:pacemaker-remote - - pacemaker-remote:pacemaker-remote -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: "None" - glance-api-version: 2 - keystone: - charm: cs:~gnuoy/keystone-36 - series: bionic - num_units: 1 - options: - admin-password: openstack - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - debug: true - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: cloud:bionic-rocky - debug: true - cpu-model: kvm64 - cpu-mode: custom - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - masakari: - charm: masakari - series: bionic - num_units: 3 - options: - openstack-origin: cloud:bionic-rocky/proposed - vip: 10.5.110.1 - ceph-mon: - charm: ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - ceph-osd: - charm: ceph-osd - constraints: mem=1G - num_units: 3 - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: cinder-ceph - masakari-monitors: - charm: cs:~gnuoy/masakari-monitors-5 - hacluster: - charm: cs:~gnuoy/hacluster-17 - options: - corosync_transport: unicast - cluster_count: 3 - pacemaker-remote: - charm: cs:~gnuoy/pacemaker-remote-7 - options: - enable-stonith: False - enable-resources: False diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index a2cebd4..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,169 +0,0 @@ -series: bionic -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp-nova - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - cinder:identity-service - - keystone:identity-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - neutron-api:identity-service - - keystone:identity-service -- - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - cinder:shared-db - - mysql:shared-db -- - neutron-api:shared-db - - mysql:shared-db -- - cinder:amqp - - rabbitmq-server:amqp -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - nova-cloud-controller:neutron-api - - neutron-api:neutron-api -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - masakari:shared-db - - mysql:shared-db -- - masakari:amqp - - rabbitmq-server:amqp -- - masakari:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - ceph-mon:osd - - ceph-osd:mon -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - nova-compute:juju-info - - masakari-monitors:container -- - nova-compute:juju-info - - hacluster:juju-info -- - keystone:identity-credentials - - masakari-monitors:identity-credentials -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: "None" - glance-api-version: 2 - keystone: - charm: cs:~gnuoy/keystone-36 - series: bionic - num_units: 1 - options: - admin-password: openstack - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - debug: true - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: cloud:bionic-rocky - debug: true - cpu-model: kvm64 - cpu-mode: custom - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - masakari: - charm: masakari - series: bionic - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky/proposed - ceph-mon: - charm: ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - ceph-osd: - charm: ceph-osd - constraints: mem=1G - num_units: 3 - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: cinder-ceph - masakari-monitors: - charm: cs:~gnuoy/masakari-monitors-4 - hacluster: - charm: cs:~gnuoy/hacluster-7 - options: - corosync_transport: unicast - cluster_count: 3 diff --git a/src/tests/bundles/overlays/bionic-rocky-pacemaker-remote-ssl.yaml.j2 b/src/tests/bundles/overlays/bionic-rocky-pacemaker-remote-ssl.yaml.j2 new file mode 100644 index 0000000..a63e04a --- /dev/null +++ b/src/tests/bundles/overlays/bionic-rocky-pacemaker-remote-ssl.yaml.j2 @@ -0,0 +1,4 @@ +applications: + masakari: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4218933..4f9c48c 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,14 +1,14 @@ charm_name: masakari tests: - - zaza.charm_tests.masakari.tests.MasakariTest + - zaza.openstack.charm_tests.masakari.tests.MasakariTest configure: - - zaza.charm_tests.vault.setup.auto_inititialize - - zaza.charm_tests.glance.setup.add_cirros_image - - zaza.charm_tests.glance.setup.add_lts_image - - zaza.charm_tests.neutron.setup.basic_overcloud_network - - zaza.charm_tests.nova.setup.create_flavors - - zaza.charm_tests.nova.setup.manage_ssh_key - - zaza.charm_tests.masakari.setup.create_segments + - zaza.openstack.charm_tests.vault.setup.auto_initialize + - zaza.openstack.charm_tests.glance.setup.add_cirros_image + - zaza.openstack.charm_tests.glance.setup.add_lts_image + - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network + - zaza.openstack.charm_tests.nova.setup.create_flavors + - zaza.openstack.charm_tests.nova.setup.manage_ssh_key + - zaza.openstack.charm_tests.masakari.setup.create_segments gate_bundles: - bionic-rocky-pacemaker-remote-ssl smoke_bundles: