Skip to content

Commit

Permalink
Updates for testing period for 23.10 release
Browse files Browse the repository at this point in the history
* charm-helpers sync for classic charms
* build.lock file for reactive charms
* ensure tox.ini is from release-tools
* Locked requirements using pip-compile:
  * existing (test-)requirements.txt ->
    (test-)requirements.in
  * pip-compile to *-py3[8|10].txt using python3.8
    and python3.10.
  * Updated tox.ini to use the appropriate merged
    requirements-*.txt files.
* Removal of lunar from metadata, charmcraft.yaml
  osci.yaml, tests.yaml and associated bundles.
* Locked libs and tests to stable/bobcat branches for:
  * charm-helpers
  * charms.openstack
  * zaza
  * zaza-openstack-tests

Change-Id: Ib764c26ce162789ef194e79002e35c7ed42aa39a
  • Loading branch information
ajkavanagh authored and freyes committed Nov 2, 2023
1 parent cf1ffe6 commit e9face7
Show file tree
Hide file tree
Showing 18 changed files with 2,224 additions and 162 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-swift-proxy.git

defaultbranch=stable/2023.2
7 changes: 0 additions & 7 deletions build-requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion charm-helpers-hooks.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/bobcat
destination: charmhelpers
include:
- core
Expand Down
3 changes: 0 additions & 3 deletions charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.10"
architectures: [amd64, s390x, ppc64el, arm64]
1 change: 0 additions & 1 deletion charmhelpers/contrib/openstack/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,6 @@ def _do_install():
return openstack_release().get('OPENSTACK_CODENAME')


@cached
def openstack_release():
"""Return /etc/os-release in a dict."""
d = {}
Expand Down
Loading

0 comments on commit e9face7

Please sign in to comment.