Commit Graph

80 Commits

Author SHA1 Message Date
Corey Bryant e6a2078299 Add 2023.2 Bobcat support
* sync charm-helpers to classic charms
* change openstack-origin/source default to bobcat
* add mantic to metadata series
* align testing with bobcat
* add new bobcat bundles
* add bobcat bundles to tests.yaml
* add bobcat tests to osci.yaml
* update build-on and run-on bases
* drop kinetic
* update charmcraft_channel to 2.x/edge

Change-Id: I390efac57bdbe5df8950fd150f7ba121f5bd36a7
2023-08-04 21:23:02 +00:00
Corey Bryant f149f9e9a4 Enable jammy-antelope voting and drop kinetic-zed tests
* Voting was turned on for jammy-antelope in the
  project-template for charm-functional-jobs in zosci-config
* Voting for jammy-antelope bundles with non-standard names
  is turned on in individual charms
* Kinetic-zed bundles/tests are removed

Change-Id: I01ea27e6bbde4ebaaf3d8efdd89d9d7cfe04ee2b
2023-03-29 21:01:49 +00:00
Corey Bryant 404e52b0ec Add Antelope support
* sync charm-helpers to classic charms
* change openstack-origin/source default to antelope
* align testing with antelope
* add new antelope bundles
* add antelope bundles to tests.yaml
* add antelope tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases

Change-Id: Iae2de09cab79f159f468aec99b824dd95d01a46e
2023-03-08 14:15:18 +00:00
Liam Young 25501b7be6 Fix charm for tox4 compatibility
Related-Bug: 2002788
Change-Id: I6f0a410081e6c26d4b5113f40191808659eda2f3
2023-01-17 14:58:46 +00:00
Corey Bryant ff4ccdd27b Add Kinetic and Zed support
* sync charm-helpers to classic charms
* change openstack-origin/source default to zed
* align testing with zed
* add new zed bundles
* add zed bundles to tests.yaml
* add zed tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases
* add bindep.txt for py310
* sync tox.ini and requirements.txt for ruamel
* use charmcraft_channel 2.0/stable
* drop reactive plugin overrides
* move interface/layer env vars to charmcraft.yaml

Change-Id: I3cc0af8443ecf62589c88d4e924cb633c419e87f
2022-11-23 16:08:18 +00:00
Corey Bryant 123e8e06f6 Build separately for each supported series and use binary builds
Charms for OpenStack Yoga supports both Ubuntu Focal and Jammy
which means Python 3.8 and Python 3.10.  Managing dependencies
across those two versions is non-trivial and we need to build
the charm on the series the charm is supposed to support.

Switch to using a binary build which allows pip's dependency
resolution to work.

This patch also drops the impish bundle and unused overlay
bundles.

Change-Id: I85d45fd390eccfef2fbdcd9de96b7b7cf01483f4
2022-11-23 16:07:05 +00:00
Corey Bryant e7fd6815c9 Fix config-flags support
This change puts the specified key/value config-flags into
the [DEFAULT] section of the config file rather than the [api]
section, as they were supposed to be in the [DEFAULT] section.

Additionally, this change switches to using the config-flags
support from charms.openstack.

Closes-Bug: #1986943
Change-Id: I77a35c074e234c3bdfa78800b05ee770492e0694
2022-11-22 19:54:53 +00:00
Alex Kavanagh ad630b1c0f Add *.charm to gitignore
This patch adds *.charm to the .gitignore to ensure that any built
artifacts are ignored.

Change-Id: Ib9fcee186b68adab8505781ebcea5eaf700af16b
2022-04-18 21:08:13 +01:00
Zuul 61d0a3210a Merge "Updates to enable jammy and finalise charmcraft builds" 2022-04-08 16:08:21 +00:00
Zeeshan Ali Shah 01679e56a3 Enable multiple arbitrary config-flags
The config flags are a comma-seperated list of keys and values.
This enables an operator to pass arbitrary configuration into
the masakari-monitors configuration.

Closes-Bug: #1941650
Change-Id: I3571bf7dfcb092ce5d04f439806e9a25465e16c5
2022-04-08 15:16:12 +05:00
Alex Kavanagh 40abdd6b73 Updates to enable jammy and finalise charmcraft builds
- Add 22.04 to charmcraft.yaml
- Update metadata to include jammy
- Remove impish from metadata
- Update osci.yaml to include py3.10 default job
- Modify tox.ini to remove py35,py36,py37 tox target and add py310
  target.
- ensure that the openstack-origin is yoga

Change-Id: I0c34ec81953fc00d5b51b14ba80092f666577d18
2022-04-04 15:50:52 +01:00
Zuul 06d34eb980 Merge "Switch to using hostname from Ussuri onward" 2022-03-28 23:17:19 +00:00
Alex Kavanagh a8d8eb5122 Update to build using charmcraft
Due to a build problem with the reactive plugin, this change falls back
on overriding the steps and doing a manual build, but it also ensures
the CI system builds the charm using charmcraft.  Changes:

- add a build-requirements.txt
- modify charmcraft.yaml
- modify osci.yaml
    -> indicate build with charmcraft
- modify tox.ini
    -> tox -e build does charmcraft build/rename
    -> tox -e build-reactive does the reactive build
- modify bundles to use the <charm>.charm artifact in tests.
  and fix deprecation warning re: prefix
- tox inception to enable tox -e func-test in the CI

Change-Id: Ida2665d20845e20b51f3270870ad9cf55a824921
2022-02-17 12:30:11 -05:00
Corey Bryant 625afbb964 Switch to using hostname from Ussuri onward
This corresponds to the upstream change titled:
"Use hostname to avoid clash with section".

This avoids a clash with the section of the same name.

An ussuri masakarimonitors.conf template is added that
uses the hostname config option. The base template continues
to use the host config option for older release, inline with
upstream.

This change also updates tox.ini, src/tox.ini, and adds pip.sh
from centrally managed release-tools.

Closes-Bug: #1941643
Change-Id: I4b5b528cf24477746bf7ff6ffedfef0b13d91816
2022-02-10 01:46:58 +00:00
Alex Kavanagh 71b6c122b9 Migrate charm to charmhub latest/edge track
Change-Id: I98db3dfc3d87d33787da90c55b17992dd0eaa300
2022-01-27 21:37:27 +00:00
Zuul c4e4faffc3 Merge "Remove all traces of process monitor" 2021-12-16 19:48:12 +00:00
Hervé Beraud 3d69d31878 Use unittest.mock instead of mock
The mock third party library was needed for mock support in py2
runtimes. Since we now only support py36 and later, we can use the
standard lib unittest.mock module instead.

Note that https://github.com/openstack/charms.openstack is used during tests
and he need `mock`, unfortunatelly it doesn't declare `mock` in its
requirements so it retrieve mock from other charm project (cross dependency).
So we depend on charms.openstack first and when
Ib1ed5b598a52375e29e247db9ab4786df5b6d142 will be merged then CI
will pass without errors.

Depends-On: Ib1ed5b598a52375e29e247db9ab4786df5b6d142
Change-Id: I13057e3e6544c8024d39c611ec8bdbbec387da6a
2021-12-15 11:49:32 +00:00
Corey Bryant 3dcfcc33e5 Add yoga bundles and release-tool syncs
* charm-helpers sync for classic charms
* sync from release-tools
* switch to release-specific zosci functional tests
* run focal-ussuri as smoke tests
* remove trusty, xenial, and groovy metadata/tests
* drop py35 and add py39

Change-Id: I07b01cf8f2762a918b0f55ac90a6173f56bf9406
2021-11-17 13:52:12 -05:00
James Page 2f33d9afeb Remove all traces of process monitor
The Masakari process monitor is explicitly outside the scope of
what we chose to enable when the original charm development was
done for Masakari.

Drop installation of the process monitor package and related
templates and configuration.

Drive-by fixup of requirements for older Pythons.

Related-Bug: 1941623
Change-Id: Id883c117e73e71842fbe7a96e0471b37e999020f
2021-11-04 14:06:56 +00:00
Alex Kavanagh e7da0946d1 Add xena bundles
- add non-voting focal-xena bundle
- add non-voting impish-xena bundle
- rebuild to pick up charm-helpers changes
- update tox/pip.sh to ensure setuptools<50.0.0

Change-Id: I61938ea31a9825b83260316af0b7ad4960b39a5b
2021-09-27 14:48:55 +01:00
Vladimir Grevtsev 37a22da2fd Fixing a Masakari service paths
Upstream process_list.yaml.sample, which was likely
a source for the charm version, has slightly different
binaries paths. This patch provides correct systemd service
names and binaries locations for the masakari-process-monitor
service.

Closes-Bug: #1941644
Change-Id: Ic209723fe7bfdf030310cf8a3e5607caf6a73853
2021-08-25 22:36:27 +04:00
Aurelien Lourot 3fb5e63311 Sync release-tools
In order to fix ResolutionImpossible on tox invocation.

https://github.com/openstack-charmers/release-tools/issues/151
https://github.com/openstack-charmers/release-tools/pull/152

Change-Id: I8f4470563b09a45c75b9456b6566450f081d67b1
2021-07-22 14:57:05 +02:00
Alex Kavanagh 0169df4f3d Test bundles for focal-wallaby and hirsute-wallaby
These are the test bundles (and any associated changes) for
focal-wallaby and hirsute-wallaby support.

hisute-wallaby test is disabled (moved to dev) due to [1].

[1] https://github.com/juju-solutions/layer-basic/issues/194

Change-Id: Ibc09d03ed16847fa81c50487b8c7ded9d87b90e3
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
2021-06-29 13:48:31 +02:00
Zuul c3f8648f20 Merge "Add impish to metadata.yaml" 2021-06-24 12:13:54 +00:00
Aurelien Lourot b0c17b127f Add impish to metadata.yaml
Change-Id: Ifd7109d7990d3b423dbdd521d235cc3e7fbb69c3
2021-06-03 11:18:28 +02:00
Corey Bryant 7991de8a8c rebuild - restore c-h proxy env vars for add-apt-repository
Change-Id: Icb1a89fb7f1759ce4c0a9081e72db75a84415f10
2021-05-13 09:10:50 -04:00
Alex Kavanagh 9edccba380 Updates to flip all libraries back to master
This patchset updates all the requirements for charms.openstack,
charm-helpers, charms.ceph, zaza and zaza-openstack-tests back
to master branch.

Change-Id: Id3cc6895c0a6c1e631dbbe925c01d05582ea5b7e
2021-05-03 16:07:34 +01:00
Zuul 7a6cfb7d9b Merge "Add Groovy to the test gate" 2021-04-12 08:46:30 +00:00
Alex Kavanagh f163279034 21.04 libraries freeze for charms on master branch
* charm-helpers sync for classic charms
* build.lock file for reactive charms
* ensure tox.ini is from release-tools
* ensure requirements.txt files are from release-tools
* On reactive charms:
  - ensure stable/21.04 branch for charms.openstack
  - ensure stable/21.04 branch for charm-helpers

Change-Id: I9ba14524ddea4b0a0a63171abfa38b9e1bb1b2b5
2021-04-03 20:28:51 +01:00
Aurelien Lourot 96facb8bb3 Add Groovy to the test gate
Change-Id: I6b46e5743130a8a3f8707fd25fde786f61af3a87
2021-03-31 10:42:22 +02:00
Zuul 1705cb46ad Merge "Add new osci.yaml" 2021-03-19 10:55:14 +00:00
Chris MacNaughton 39c3dcb6d4 Add new osci.yaml
This change is preparatory to migration Ubuntu OpenStack CI
from Jenkins to Zuul

Change-Id: I996496c12e189257a27fdb39dd094ccb0a6df929
2021-03-18 16:32:12 +01:00
Alex Kavanagh fbe04d5665 Add hirsute and remove trusty from metadata.yaml
This update adds the new hirsute Ubuntu release (21.04) and
removes trusty support (14.04 which is EOL at 21.04).

Change-Id: I8623128fd878d22b4b89c1316eb8c1c9234304b6
2021-03-02 20:59:05 +00:00
Alex Kavanagh 02d6b7e0eb Updates to pin charm-tools to 2.8.3
* Update requirements.txt to pin charm-tools to 2.8.3
* Update tox.ini to change the build parameters.
* This upgrades from <2.7 which adds reproducible charms
* Bug was fixed that controlled the default output directory
  doesn't get 'builds' appended.  The tox change puts it
  back so that stable & master both build to the same
  directory.  This may be reviewed in the future.

Change-Id: Ibc4a8b508697208e1be4be0548df1cdcf92a472c
2021-02-17 12:13:48 +00:00
Alex Kavanagh 1804db80d2 Rebuild to use charm-tools pre 2.8 release
Reverting to an earlier version of charm-tools to
resolve some building issues seen with latest 2.8.2
version.

Change-Id: Ia8767f0d7ba14e7d830c323fb81d02fc29b7c3af
2021-02-02 17:10:11 +00:00
David Ames 6b6005533e Rebuild with udpated charm-tools 2.8.2
Validate the newest version of charm-tools: 2.8.2
https://github.com/juju/charm-tools/pull/598

Change-Id: Ia539e21f4d1951058b0776903d78ffd3fd71bd18
2021-02-01 14:09:59 -08:00
Alex Kavanagh b448696053 Updates for testing period for 20.01 release
Includes updates to charmhelpers/charms.openstack for cert_utils
and unit-get for the install hook error on Juju 2.9

* charm-helpers sync for classic charms
* rebuild for reactive charms
* ensure tox.ini is from release-tools
* ensure requirements.txt files are from release-tools
* On reactive charms:
  - ensure master branch for charms.openstack
  - ensure master branch for charm-helpers

Change-Id: I59a13af81392a35c647fe01d2c14745ed84121f8
2021-01-15 16:31:48 +00:00
Aurelien Lourot c2afb75a1b Remove Disco and Eoan bits
Change-Id: I6f9239eb9613801af2b975aef3ee6ee1b5305aa1
2021-01-12 13:58:54 +01:00
Aurelien Lourot 822edc597c Sync release-tools
Sync release-tools boilerplate containing these changes
in order to pin pip < 20.3:
https://github.com/openstack-charmers/release-tools/pull/125
https://github.com/openstack-charmers/release-tools/pull/126
https://github.com/openstack-charmers/release-tools/pull/127
https://github.com/openstack-charmers/release-tools/pull/129

Change-Id: Ifaf0c6d1a8b0a2ae4bd911fecf4cccd8b21586ab
2020-12-15 10:56:56 +01:00
Alex Kavanagh 9eb71e10f4 Rebuild reactive charms to pick up latest charm-helpers release.
v0.20.18 has been released and needs incorporating into the reactive charms.

Change-Id: I0ce4d0f315a5ee0c4842cc9e935f7d2618725f41
2020-10-14 16:33:09 +01:00
Alex Kavanagh ff48bc4fdc Sync libraries & common files prior to freeze
* charm-helpers sync for classic charms
* charms.ceph sync for ceph charms
* rebuild for reactive charms
* sync tox.ini files as needed
* sync requirements.txt files to sync to standard

Change-Id: If009ba69de6463374b3c929d8888b90595ebb91b
2020-09-26 18:35:17 +01:00
Zuul 4f975044c1 Merge "Honour use-internal-endpoints" 2020-09-15 16:37:34 +00:00
Liam Young 442ce8e7b0 Honour use-internal-endpoints
If use-internal-endpoints is set to true then reflect that in
the masakari monitors config file.

Change-Id: I26ad45ff0fa4088a4b0a0f64d031bb805af45a78
Closes-Bug: 1895657
2020-09-15 14:11:37 +00:00
Liam Young b2023ef54c Add region config option
Masakari monitors looks up the masakari endpoint in the keystone
catalogue, to do this it needs to know the region it should be
targetting. To achieve this this change adds the region config
option.

Change-Id: Idb593ee8017252d0cd21dd58ee6d662536eba5a4
Closes-Bug: 1895656
2020-09-15 13:46:26 +00:00
Aurelien Lourot aea354f9a8 Add focal-victoria to the test gate
Change-Id: I4ee1cee91a81f137576c2fae832a63e70dbf6fd2
2020-08-28 14:27:05 +02:00
Alex Kavanagh 1ad3287b78 Release sync for 20.08
- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild
- sync tox.ini
- sync requirements.txt and test-requirements.txt

Change-Id: I1e0a8a5153dd511c273a32936ad714a8434e9792
2020-07-27 20:54:07 +01:00
Zuul ddaf45f4ac Merge "Add Victoria test bundles" 2020-07-20 15:07:49 +00:00
Zuul a5be51cf2e Merge "Add victoria, ussuri, train package versions" 2020-07-17 13:35:55 +00:00
Aurelien Lourot 002d829d96 Add Victoria test bundles
Change-Id: Ied1736a70c70d2b246fba99b3447f2a3cd591eac
2020-07-17 09:45:20 +02:00
Corey Bryant a0e1741a91 Add victoria, ussuri, train package versions
Also remove jinja2 from wheelhouse.txt as is a duplicate
and due to improvements in charm build it now causes the
build to fail.

Change-Id: I62f5315c32cfc014ef8a8581ca5f977ec6114263
2020-07-14 09:30:08 -04:00