Merge pull request #47 from openstack-charmers/add-watcher-charms

Add zed/yoga/2023.1 channel recipes for watcher-*

charmed_openstack_info/data/lp-builder-config/openstack.yaml

@@ -852,20 +852,6 @@ projects:
     launchpad: charm-swift-storage
     repository: https://opendev.org/openstack/charm-swift-storage.git
 
-  # Temporarily disabled as don't know the plans for this charm?
-  # - name: OpenStack Watcher Charm
-  # Note: watcher is not promulgated
-  #  charmhub: openstack-charmers-next-watcher
-  #  launchpad: charm-watcher
-  #  repository: https://opendev.org/openstack/charm-watcher.git
-
-  # Temporarily disabled as don't know the plans for this charm?
-  #- name: OpenStack Watcher Dashboard Charm
-  # Note: watcher-dashboard is not promulgated
-  #  charmhub: openstack-charmers-next-watcher-dashboard
-  #  launchpad: charm-watcher-dashboard
-  #  repository: https://opendev.org/openstack/charm-watcher-dashboard.git
-
   - name: OpenStack Cinder Backup Swift Proxy Charm
     charmhub: cinder-backup-swift-proxy
     launchpad: charm-cinder-backup-swift-proxy
@@ -2231,18 +2217,44 @@ projects:
     repository: https://opendev.org/openstack/charm-watcher.git
     branches:
       master:
+        enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "2.x/stable"
         channels:
           - latest/edge
         bases:
           - "22.04"
-          - "23.04"
           - "23.10"
+      stable/yoga:
+        enabled: True
+        build-channels:
+          charmcraft: "2.x/stable"
+        channels:
+          - yoga/stable
+        bases:
+          - "22.04"
+      stable/zed:
+        enabled: True
+        build-channels:
+          charmcraft: "2.x/stable"
+        channels:
+          - zed/stable
+        bases:
+          - "22.04"
+          - "22.10"
+      stable/2023.1:
+        enabled: True
+        build-channels:
+          charmcraft: "2.x/stable"
+        channels:
+          - 2023.1/stable
+        bases:
+          - "22.04"
+          - "23.04"
       stable/2023.2:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "2.x/stable"
         channels:
           - 2023.2/stable
         bases:
@@ -2255,18 +2267,44 @@ projects:
     repository: https://opendev.org/openstack/charm-watcher-dashboard.git
     branches:
       master:
+        enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "2.x/stable"
         channels:
           - latest/edge
         bases:
           - "22.04"
-          - "23.04"
           - "23.10"
+      stable/yoga:
+        enabled: True
+        build-channels:
+          charmcraft: "2.x/stable"
+        channels:
+          - yoga/stable
+        bases:
+          - "22.04"
+      stable/zed:
+        enabled: True
+        build-channels:
+          charmcraft: "2.x/stable"
+        channels:
+          - zed/stable
+        bases:
+          - "22.04"
+          - "22.10"
+      stable/2023.1:
+        enabled: True
+        build-channels:
+          charmcraft: "2.x/stable"
+        channels:
+          - 2023.1/stable
+        bases:
+          - "22.04"
+          - "23.04"
       stable/2023.2:
         enabled: True
         build-channels:
-          charmcraft: "2.x/candidate"
+          charmcraft: "2.x/stable"
         channels:
           - 2023.2/stable
         bases:

charmed_openstack_info/loader.py

@@ -146,7 +146,7 @@ def _add_branches(self, branches_spec: Dict[str, Dict]) -> None:
             ref = f'refs/heads/{branch}'
             if ref not in self.branches:
                 self.branches[ref] = dict(default_branch_info)
-            if type(branch_info) != dict:
+            if not isinstance(branch_info, dict):
                 raise ValueError('Expected a dict for key branches, '
                                  f' instead got {type(branch_info)}')
 

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
 requires = ["pbr>=5.7.0", "setuptools>=36.6.0"]
-build-backend = "pbr.build"
+build-backend = "pbr.build"

test-requirements.txt

@@ -5,5 +5,8 @@ mypy
 types-PyYAML
 # Fix "ModuleNotFoundError: No module named 'DistUtilsExtra'"
 git+https://git.launchpad.net/~freyes/python-apt@setup-requires#egg=python-apt
+# Override charmcraft version in charmhub-lp-tools to <2.5.0 for tests to pass
+# See https://github.com/canonical/charmcraft/issues/1472
+charmcraft < 2.5.0
 # used to validate the lp-builder-config files.
 git+https://github.com/openstack-charmers/charmhub-lp-tools.git#egg=charmhub-lp-tools