From 4a40c4581de94ae567f77de0b5002cea2d3155cc Mon Sep 17 00:00:00 2001 From: Hemanth Nakkina Date: Thu, 4 Aug 2022 15:36: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: I8bc1a4099b7f533ffee5885ac5e91204ec70853e --- .../.github/workflows/release-edge.yaml | 57 ------------------- charms/glance-k8s/.github/workflows/tox.yaml | 27 --------- charms/glance-k8s/.gitreview | 5 ++ charms/glance-k8s/.zuul.yaml | 4 ++ charms/glance-k8s/CONTRIBUTING.md | 2 +- charms/glance-k8s/README.md | 2 +- charms/glance-k8s/charmcraft.yaml | 8 +++ charms/glance-k8s/requirements.txt | 7 +-- charms/glance-k8s/tox.ini | 6 +- 9 files changed, 25 insertions(+), 93 deletions(-) delete mode 100644 charms/glance-k8s/.github/workflows/release-edge.yaml delete mode 100644 charms/glance-k8s/.github/workflows/tox.yaml create mode 100644 charms/glance-k8s/.gitreview create mode 100644 charms/glance-k8s/.zuul.yaml diff --git a/charms/glance-k8s/.github/workflows/release-edge.yaml b/charms/glance-k8s/.github/workflows/release-edge.yaml deleted file mode 100644 index 59d88e1e..00000000 --- a/charms/glance-k8s/.github/workflows/release-edge.yaml +++ /dev/null @@ -1,57 +0,0 @@ -name: Release to Edge - -on: - push: - branches: - - main - -jobs: - lint: - name: Lint - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Install dependencies - run: python3 -m pip install tox - - name: Run linters - run: tox -e pep8 - - unit-test: - name: Unit tests - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Install dependencies - run: python -m pip install tox - - name: Run tests - run: tox -e py3 - - release-to-charmhub: - name: Release to CharmHub - needs: - - lint - - unit-test - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Select charmhub channel - uses: canonical/charming-actions/channel@1.0.0 - id: channel - - - name: Upload charm to charmhub - uses: canonical/charming-actions/upload-charm@1.0.0 - with: - credentials: "${{ secrets.CHARMHUB_TOKEN }}" - github-token: "${{ secrets.GITHUB_TOKEN }}" - upload-image: "true" - channel: "${{ steps.channel.outputs.name }}" diff --git a/charms/glance-k8s/.github/workflows/tox.yaml b/charms/glance-k8s/.github/workflows/tox.yaml deleted file mode 100644 index ddfeff1e..00000000 --- a/charms/glance-k8s/.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/charms/glance-k8s/.gitreview b/charms/glance-k8s/.gitreview new file mode 100644 index 00000000..48ce75b3 --- /dev/null +++ b/charms/glance-k8s/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=review.opendev.org +port=29418 +project=openstack/charm-glance-k8s.git +defaultbranch=main diff --git a/charms/glance-k8s/.zuul.yaml b/charms/glance-k8s/.zuul.yaml new file mode 100644 index 00000000..7ffc71cb --- /dev/null +++ b/charms/glance-k8s/.zuul.yaml @@ -0,0 +1,4 @@ +- project: + templates: + - openstack-python3-charm-yoga-jobs + - openstack-cover-jobs diff --git a/charms/glance-k8s/CONTRIBUTING.md b/charms/glance-k8s/CONTRIBUTING.md index 527688d3..1d281a53 100644 --- a/charms/glance-k8s/CONTRIBUTING.md +++ b/charms/glance-k8s/CONTRIBUTING.md @@ -51,4 +51,4 @@ To deploy the local test instance: -[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/charms/glance-k8s/README.md b/charms/glance-k8s/README.md index d987a924..d5e38c92 100644 --- a/charms/glance-k8s/README.md +++ b/charms/glance-k8s/README.md @@ -61,7 +61,7 @@ Please report bugs on [Launchpad][lp-bugs-charm-glance-k8s]. -[contributors-guide]: https://github.com/openstack-charmers/charm-glance-operator/blob/main/CONTRIBUTING.md +[contributors-guide]: https://opendev.org/openstack/charm-glance-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-glance-k8s]: https://bugs.launchpad.net/charm-glance-k8s/+filebug diff --git a/charms/glance-k8s/charmcraft.yaml b/charms/glance-k8s/charmcraft.yaml index 08ce6ba5..e57d6d9f 100644 --- a/charms/glance-k8s/charmcraft.yaml +++ b/charms/glance-k8s/charmcraft.yaml @@ -7,7 +7,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/charms/glance-k8s/requirements.txt b/charms/glance-k8s/requirements.txt index f1f89572..55edf37b 100644 --- a/charms/glance-k8s/requirements.txt +++ b/charms/glance-k8s/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/charms/glance-k8s/tox.ini b/charms/glance-k8s/tox.ini index 7044cca0..5a6c0321 100644 --- a/charms/glance-k8s/tox.ini +++ b/charms/glance-k8s/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}