Merge lp:~xfactor973/openstack-mojo-specs/gluster into lp:openstack-mojo-specs

Proposed by Chris Holcombe
Status: Merged
Merged at revision: 286
Proposed branch: lp:~xfactor973/openstack-mojo-specs/gluster
Merge into: lp:openstack-mojo-specs
Diff against target: 101 lines (+62/-0)
5 files modified
helper/bundles/gluster-default.yaml (+12/-0)
helper/collect/collect-gluster-default (+1/-0)
helper/tests/test_gluster.py (+34/-0)
specs/file_storage/gluster/default/3.7/SPEC_INFO.txt (+2/-0)
specs/file_storage/gluster/default/3.7/manifest (+13/-0)
To merge this branch: bzr merge lp:~xfactor973/openstack-mojo-specs/gluster
Reviewer Review Type Date Requested Status
David Ames Pending
Review via email: mp+298845@code.launchpad.net

Description of the change

This adds Gluster into mojo CI testing. I plan on expanding on this so that we can test integration with Gluster as a glance backing store. Mojo is basically my only testing option at this point because Gluster only uses juju storage and amulet doesn't have support for that currently.

To post a comment you must log in.
265. By Chris Holcombe

Clean up lint warnings and add xenial series to testing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'helper/bundles/gluster-default.yaml'
--- helper/bundles/gluster-default.yaml 1970-01-01 00:00:00 +0000
+++ helper/bundles/gluster-default.yaml 2016-10-07 18:04:15 +0000
@@ -0,0 +1,12 @@
1base:
2 series:
3 - trusty
4 - xenial
5 services:
6 gluster:
7 charm: gluster
8 num_units: 3
9 storage:
10 brick: 1,5G
11 options:
12 volume_name: test
013
=== added file 'helper/collect/collect-gluster-default'
--- helper/collect/collect-gluster-default 1970-01-01 00:00:00 +0000
+++ helper/collect/collect-gluster-default 2016-10-07 18:04:15 +0000
@@ -0,0 +1,1 @@
1gluster git://github.com/cholcombe973/gluster-charm
02
=== added file 'helper/tests/test_gluster.py'
--- helper/tests/test_gluster.py 1970-01-01 00:00:00 +0000
+++ helper/tests/test_gluster.py 2016-10-07 18:04:15 +0000
@@ -0,0 +1,34 @@
1#!/usr/bin/python
2
3import sys
4
5import utils.mojo_utils as mojo_utils
6
7
8def main(argv):
9 # Mount the storage volume
10 mojo_utils.remote_run(
11 'gluster/0',
12 'mkdir /mnt/gluster && mount -t glusterfs localhost:test /mnt/gluster')
13 mojo_utils.remote_run(
14 'gluster/1',
15 'mkdir /mnt/gluster && mount -t glusterfs localhost:test /mnt/gluster')
16 mojo_utils.remote_run(
17 'gluster/2',
18 'mkdir /mnt/gluster && mount -t glusterfs localhost:test /mnt/gluster')
19
20 # Check
21 mojo_utils.remote_run('gluster/0',
22 'echo 123456789 > /mnt/gluster/test_input')
23
24 # Check
25 output = mojo_utils.remote_run('gluster/1', 'cat /mnt/gluster/test_input')
26
27 # Cleanup
28 mojo_utils.remote_run('gluster/2', 'rm /mnt/gluster/test_input')
29 if output[0].strip() != "123456789":
30 sys.exit(1)
31
32
33if __name__ == "__main__":
34 sys.exit(main(sys.argv))
035
=== added directory 'specs/file_storage'
=== added directory 'specs/file_storage/gluster'
=== added directory 'specs/file_storage/gluster/default'
=== added directory 'specs/file_storage/gluster/default/3.7'
=== added file 'specs/file_storage/gluster/default/3.7/SPEC_INFO.txt'
--- specs/file_storage/gluster/default/3.7/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
+++ specs/file_storage/gluster/default/3.7/SPEC_INFO.txt 2016-10-07 18:04:15 +0000
@@ -0,0 +1,2 @@
1This spec deploys a 3 gluster node cluster. It then tests to verify
2you can write to and read from the cluster.
03
=== added symlink 'specs/file_storage/gluster/default/3.7/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/file_storage/gluster/default/3.7/collect-gluster-default'
=== target is u'../../../../../helper/collect/collect-gluster-default'
=== added symlink 'specs/file_storage/gluster/default/3.7/gluster-default.yaml'
=== target is u'../../../../../helper/bundles/gluster-default.yaml'
=== added file 'specs/file_storage/gluster/default/3.7/manifest'
--- specs/file_storage/gluster/default/3.7/manifest 1970-01-01 00:00:00 +0000
+++ specs/file_storage/gluster/default/3.7/manifest 2016-10-07 18:04:15 +0000
@@ -0,0 +1,13 @@
1# Collect the charm branches from Launchpad
2collect config=collect-gluster-default
3
4# Use juju deployer with gluster-default.yaml bundle
5deploy config=gluster-default.yaml delay=0 wait=True target=base
6
7# Check juju statuses are green and that hooks have finished
8verify config=check_juju.py
9
10# Test obj store by sending and recieving files
11verify config=test_gluster.py
12
13# Success
014
=== added symlink 'specs/file_storage/gluster/default/3.7/test_gluster.py'
=== target is u'../../../../../helper/tests/test_gluster.py'
=== added symlink 'specs/file_storage/gluster/default/3.7/utils'
=== target is u'../../../../../helper/utils'

Subscribers

People subscribed via source and target branches