From 36fde78d1950639e27e950565092316388066a3e Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <hemanth.nakkina@canonical.com>
Date: Fri, 5 Aug 2022 06:31:33 +0530
Subject: [PATCH] Remove references to old github
Remove references in documentation to openstack-charmers
repos.
Remove github workflows.
Add .gitreview file
Add .zuul.yaml file
Update packages in requirements file to point to
opendev.org instead of github.com
Change-Id: Ib72255da7fdee624160e230ed828f8deea898b17
---
.github/workflows/tox.yaml | 27 ---------------------------
.gitreview | 5 +++++
.zuul.yaml | 4 ++++
CONTRIBUTING.md | 2 +-
README.md | 2 +-
charmcraft.yaml | 8 ++++++++
requirements.txt | 7 +++----
src/ovsdb.py | 2 +-
tox.ini | 6 +++---
9 files changed, 26 insertions(+), 37 deletions(-)
delete mode 100644 .github/workflows/tox.yaml
create mode 100644 .gitreview
create mode 100644 .zuul.yaml
diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml
deleted file mode 100644
index ddfeff1..0000000
--- a/.github/workflows/tox.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Python package
-
-on:
- - push
- - pull_request
-
-jobs:
- build:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- python-version: [3.8, 3.9]
-
- steps:
- - uses: actions/checkout@v1
- - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
- with:
- python-version: ${{ matrix.python-version }}
- - name: Install dependencies
- run: |
- python -m pip install --upgrade pip
- pip install tox tox-gh-actions
- - name: Lint with tox
- run: tox -e pep8
- - name: Test with tox
- run: tox -e py${{ matrix.python-version }}
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..95d816b
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=review.opendev.org
+port=29418
+project=x/charm-ovn-central-k8s.git
+defaultbranch=main
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..7ffc71c
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+ templates:
+ - openstack-python3-charm-yoga-jobs
+ - openstack-cover-jobs
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d931f11..0c55b9c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,4 +52,4 @@ To deploy the local test instance:
<!-- LINKS -->
-[sunbeam-docs]: https://github.com/openstack-charmers/advanced-sunbeam-openstack/blob/main/README.rst
+[sunbeam-docs]: https://opendev.org/openstack/charm-ops-sunbeam/src/branch/main/README.rst
diff --git a/README.md b/README.md
index 2555c4d..f1a4ece 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ Please report bugs on [Launchpad][lp-bugs-charm-ovn-central-k8s].
<!-- LINKS -->
-[contributors-guide]: https://github.com/openstack-charmers/charm-ovn-central-operator/blob/main/CONTRIBUTING.md
+[contributors-guide]: https://opendev.org/x/charm-ovn-central-k8s/src/branch/main/CONTRIBUTING.md
[juju-docs-actions]: https://jaas.ai/docs/actions
[juju-docs-config-apps]: https://juju.is/docs/configuring-applications
[lp-bugs-charm-ovn-central-k8s]: https://bugs.launchpad.net/charm-ovn-central-k8s/+filebug
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 65ce952..b5b42f3 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -9,7 +9,15 @@ bases:
- name: "ubuntu"
channel: "20.04"
parts:
+ update-certificates:
+ plugin: nil
+ override-build: |
+ apt update
+ apt install -y ca-certificates
+ update-ca-certificates
+
charm:
+ after: [update-certificates]
build-packages:
- git
- libffi-dev
diff --git a/requirements.txt b/requirements.txt
index f1f8957..55edf37 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ jinja2
lightkube
lightkube-models
ops
-git+https://github.com/openstack-charmers/advanced-sunbeam-openstack#egg=ops_sunbeam
+git+https://opendev.org/openstack/charm-ops-sunbeam#egg=ops_sunbeam
python-keystoneclient # keystone-k8s
@@ -22,10 +22,9 @@ python-keystoneclient # keystone-k8s
# Note: Remove when traefik-k8s-operator v1 library is released
serialized_data_interface
-# Get resources from github until cacerts issue is charmbuild image is fixed.
-git+https://github.com/openstack/charm-ops-interface-tls-certificates#egg=interface_tls_certificates
+git+https://opendev.org/openstack/charm-ops-interface-tls-certificates#egg=interface_tls_certificates
# Note: Required for cinder-k8s, cinder-ceph-k8s, glance-k8s, nova-k8s
-git+https://github.com/openstack/charm-ops-interface-ceph-client#egg=interface_ceph_client
+git+https://opendev.org/openstack/charm-ops-interface-ceph-client#egg=interface_ceph_client
# Charmhelpers is only present as interface_ceph_client uses it.
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
diff --git a/src/ovsdb.py b/src/ovsdb.py
index 458517f..780e51d 100644
--- a/src/ovsdb.py
+++ b/src/ovsdb.py
@@ -208,7 +208,7 @@ class SimpleOVSDB(object):
decoded_set = []
for el in data[1]:
decoded_set.append(self._deserialize_ovsdb(el))
- return(decoded_set)
+ return decoded_set
# fall back to normal processing below
break
diff --git a/tox.ini b/tox.ini
index 7044cca..5a6c032 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,15 +51,15 @@ deps =
{[testenv]deps}
-r{toxinidir}/requirements.txt
-[testenv:py3.8]
+[testenv:py38]
basepython = python3.8
deps = {[testenv:py3]deps}
-[testenv:py3.9]
+[testenv:py39]
basepython = python3.9
deps = {[testenv:py3]deps}
-[testenv:py3.10]
+[testenv:py310]
basepython = python3.10
deps = {[testenv:py3]deps}