summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam Young <liam.young@canonical.com>2018-11-01 11:48:53 +0000
committerLiam Young <liam.young@canonical.com>2018-11-02 10:46:47 +0000
commit4d27c53606411a6d9d4de361601f314c0b74ee89 (patch)
treeed18e6b8a30a1c4f55e209b183da4dd168d628c0
parente256f5ef8c67d4e10db15921b7c4393699408a1a (diff)
Configure for CI
* Update bundle to use next branches * Add zuul config * Add gitreview config Change-Id: Ie9383dac05f2e37d5838d293ffebb72c55f218b4
Notes
Notes (review): Verified+1: Canonical CI <uosci-testing-bot@ubuntu.com> Code-Review+2: Chris MacNaughton (icey) <chris.macnaughton@canonical.com> Workflow+1: Chris MacNaughton (icey) <chris.macnaughton@canonical.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 02 Nov 2018 12:38:43 +0000 Reviewed-on: https://review.openstack.org/614743 Project: openstack/charm-nova-cell-controller Branch: refs/heads/master
-rw-r--r--.gitreview4
-rw-r--r--.zuul.yaml3
-rw-r--r--src/tests/bundles/bionic-rocky.yaml20
-rw-r--r--src/tox.ini2
4 files changed, 18 insertions, 11 deletions
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..0d22fa4
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
1[gerrit]
2host=review.openstack.org
3port=29418
4project=openstack/charm-nova-cell-controller.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 @@
1- project:
2 templates:
3 - python35-charm-jobs
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
index 0a9f3e7..4e5d1f9 100644
--- a/src/tests/bundles/bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@@ -62,32 +62,32 @@ relations:
62 - neutron-gateway:juju-info 62 - neutron-gateway:juju-info
63applications: 63applications:
64 glance: 64 glance:
65 charm: cs:glance 65 charm: cs:~openstack-charmers-next/glance
66 num_units: 1 66 num_units: 1
67 options: 67 options:
68 openstack-origin: cloud:bionic-rocky 68 openstack-origin: cloud:bionic-rocky
69 worker-multiplier: 0.25 69 worker-multiplier: 0.25
70 keystone: 70 keystone:
71 charm: cs:keystone 71 charm: cs:~openstack-charmers-next/keystone
72 num_units: 1 72 num_units: 1
73 options: 73 options:
74 admin-password: openstack 74 admin-password: openstack
75 openstack-origin: cloud:bionic-rocky 75 openstack-origin: cloud:bionic-rocky
76 worker-multiplier: 0.25 76 worker-multiplier: 0.25
77 mysql: 77 mysql:
78 charm: cs:percona-cluster 78 charm: cs:~openstack-charmers-next/percona-cluster
79 num_units: 1 79 num_units: 1
80 options: 80 options:
81 innodb-buffer-pool-size: 256M 81 innodb-buffer-pool-size: 256M
82 max-connections: 1000 82 max-connections: 1000
83 mysql-cell2: 83 mysql-cell2:
84 charm: cs:percona-cluster 84 charm: cs:~openstack-charmers-next/percona-cluster
85 num_units: 1 85 num_units: 1
86 options: 86 options:
87 innodb-buffer-pool-size: 256M 87 innodb-buffer-pool-size: 256M
88 max-connections: 1000 88 max-connections: 1000
89 neutron-api: 89 neutron-api:
90 charm: cs:neutron-api 90 charm: cs:~openstack-charmers-next/neutron-api
91 num_units: 1 91 num_units: 1
92 options: 92 options:
93 flat-network-providers: physnet1 93 flat-network-providers: physnet1
@@ -102,10 +102,10 @@ applications:
102 openstack-origin: cloud:bionic-rocky 102 openstack-origin: cloud:bionic-rocky
103 worker-multiplier: 0.25 103 worker-multiplier: 0.25
104 neutron-openvswitch: 104 neutron-openvswitch:
105 charm: cs:neutron-openvswitch 105 charm: cs:~openstack-charmers-next/neutron-openvswitch
106 num_units: 0 106 num_units: 0
107 nova-cloud-controller: 107 nova-cloud-controller:
108 charm: cs:~gnuoy/nova-cloud-controller-43 108 charm: cs:~openstack-charmers-next/nova-cloud-controller
109 num_units: 1 109 num_units: 1
110 options: 110 options:
111 network-manager: Neutron 111 network-manager: Neutron
@@ -136,11 +136,11 @@ applications:
136 charm: cs:ntp-24 136 charm: cs:ntp-24
137 num_units: 0 137 num_units: 0
138 rabbitmq-server-nova: 138 rabbitmq-server-nova:
139 charm: cs:rabbitmq-server 139 charm: cs:~openstack-charmers-next/rabbitmq-server
140 num_units: 1 140 num_units: 1
141 rabbitmq-server-nova-cell2: 141 rabbitmq-server-nova-cell2:
142 charm: cs:rabbitmq-server 142 charm: cs:~openstack-charmers-next/rabbitmq-server
143 num_units: 1 143 num_units: 1
144 rabbitmq-server-neutron: 144 rabbitmq-server-neutron:
145 charm: cs:rabbitmq-server 145 charm: cs:~openstack-charmers-next/rabbitmq-server
146 num_units: 1 146 num_units: 1
diff --git a/src/tox.ini b/src/tox.ini
index ba390f0..3b0b821 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
6setenv = VIRTUAL_ENV={envdir} 6setenv = VIRTUAL_ENV={envdir}
7 PYTHONHASHSEED=0 7 PYTHONHASHSEED=0
8whitelist_externals = juju 8whitelist_externals = juju
9passenv = HOME TERM CS_API_* OS_* 9passenv = HOME TERM CS_API_* OS_* AMULET_*
10deps = -r{toxinidir}/test-requirements.txt 10deps = -r{toxinidir}/test-requirements.txt
11install_command = 11install_command =
12 pip install {opts} {packages} 12 pip install {opts} {packages}