Skip to content

Commit

Permalink
21.10 - Stable cut of charms for testing period
Browse files Browse the repository at this point in the history
* use stable/21.10 libraries
* use zaza/zaza-openstack-tests at stable/21.10
* build.lock files for reactive charms
* bundles refer to ~openstack-charms candidate channel
* Update tox.ini and pip.sh

Change-Id: Ibf8acb0a7a637ab74fe4a262825f3dec648cf454
  • Loading branch information
ajkavanagh committed Oct 13, 2021
1 parent 2cfacc2 commit c7da249
Show file tree
Hide file tree
Showing 22 changed files with 614 additions and 194 deletions.
2 changes: 2 additions & 0 deletions .gitreview
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-ceph-fs.git

defaultbranch=stable/21.10
18 changes: 18 additions & 0 deletions pip.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env bash
#
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos. See the 'global' dir contents for available
# choices of tox.ini for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
# setuptools 58.0 dropped the support for use_2to3=true which is needed to
# install blessings (an indirect dependency of charm-tools).
#
# More details on the beahvior of tox and virtualenv creation can be found at
# https://github.com/tox-dev/tox/issues/448
#
# This script is wrapper to force the use of the pinned versions early in the
# process when the virtualenv was created and upgraded before installing the
# depedencies declared in the target.
pip install 'pip<20.3' 'setuptools<50.0.0'
pip "$@"
198 changes: 198 additions & 0 deletions src/build.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a3ff62c32c993d80417f6e093e3ef95e42f62083"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "refs/heads/master",
"commit": "207bac8bec837edc6a4d6003f51d5b59d2d75adb"
},
{
"type": "layer",
"item": "layer:ceph",
"url": "https://github.com/openstack/charm-layer-ceph.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "17d40abd8d9ec3b8c32756ca981c80c4733c016f"
},
{
"type": "layer",
"item": "ceph-fs",
"url": null,
"vcs": null,
"branch": "refs/heads/21.10-updates\nrefs/heads/master",
"commit": "refs/heads/21.10-updates\nrefs/heads/master"
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "refs/heads/master",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"type": "layer",
"item": "interface:ceph-mds",
"url": "https://opendev.org/openstack/charm-interface-ceph-client.git",
"vcs": null,
"branch": null,
"commit": "3ca251fb01a7cd51d2a0ee2b9b66647c8ffe891f"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "2.10.1"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.8.0"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "1.15.0"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "41.6.0"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "18.1"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.6.0"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "5.2"
},
{
"type": "python_module",
"package": "dnspython3",
"vcs": null,
"version": "1.15.0"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "1.17.0"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "1.1.1"
},
{
"type": "python_module",
"package": "Tempita",
"vcs": null,
"version": "0.4"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "refs/heads/stable/21.10",
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
"vcs": "git"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.4.1"
},
{
"type": "python_module",
"package": "ceph_api",
"vcs": null,
"version": "0.4.0"
},
{
"type": "python_module",
"package": "six",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "refs/heads/stable/21.10",
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
"vcs": "git"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "charms.ceph",
"url": "git+https://github.com/openstack/charms.ceph.git",
"branch": "refs/heads/master",
"version": "16bcf7571279c64da98fa9176ae030390ba78639",
"vcs": "git"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.33.6"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
},
{
"type": "python_module",
"package": "pyxattr",
"vcs": null,
"version": "0.7.2"
}
]
}
4 changes: 2 additions & 2 deletions src/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
#

# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
33 changes: 22 additions & 11 deletions src/tests/bundles/bionic-queens.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,62 +5,73 @@ applications:
series: bionic
num_units: 1
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
osd-devices: '/srv/ceph /dev/test-non-existent'
channel: candidate
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
monitor-count: '3'
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
dataset-size: 25%
max-connections: 1000
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
keystone:
expose: True
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
channel: candidate
glance:
expose: True
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=8G
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
nova-cloud-controller:
expose: True
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
channel: candidate
relations:
- - ceph-mon:mds
- ceph-fs:ceph-mds
Expand Down
Loading

0 comments on commit c7da249

Please sign in to comment.