cleanup on migration to opendev

Remove references to old repo
Add .gitreview
Add .zuul.yaml

Change-Id: I66f0effc29d68564c01aaa0018786c9e04153552
This commit is contained in:
Hemanth Nakkina 2022-08-04 11:59:05 +05:30
parent e21c522b81
commit 84e90b31c5
6 changed files with 42 additions and 55 deletions

5
.gitreview Normal file
View File

@ -0,0 +1,5 @@
[gerrit]
host=review.opendev.org
port=29418
project=openstack/charm-ops-sunbeam.git
defaultbranch=main

4
.zuul.yaml Normal file
View File

@ -0,0 +1,4 @@
- project:
templates:
- openstack-python3-charm-yoga-jobs
- openstack-cover-jobs

View File

@ -24,8 +24,8 @@ Add ASO common files to new charm. The script will ask a few basic questions:
.. code:: bash .. code:: bash
git clone https://github.com/openstack-charmers/advanced-sunbeam-openstack git clone https://opendev.org/openstack/charm-ops-sunbeam
cd advanced-sunbeam-openstack cd charm-ops-sunbeam
./sunbeam-charm-init.sh ~/branches/charm-ironic-operator ./sunbeam-charm-init.sh ~/branches/charm-ironic-operator
This tool is designed to be used after 'charmcraft init' was initially run This tool is designed to be used after 'charmcraft init' was initially run

View File

@ -27,7 +27,7 @@ from ops.framework import StoredState
class PeersRelationCreatedEvent(EventBase): class PeersRelationCreatedEvent(EventBase):
"""The PeersRelationCreatedEvent indicates that the peer relation now exists. """The PeersRelationCreatedEvent indicates that peer relation now exists.
It does not indicate that any peers are available or have joined, simply It does not indicate that any peers are available or have joined, simply
that the relation exists. This is useful to to indicate that the that the relation exists. This is useful to to indicate that the

View File

@ -1,6 +1,6 @@
ops ops
jinja2 jinja2
git+https://github.com/openstack-charmers/advanced-sunbeam-openstack#egg=ops_sunbeam git+https://github.com/openstack/charm-ops-sunbeam#egg=ops_sunbeam
lightkube lightkube
# These are only needeed if the charm relates to ceph # These are only needeed if the charm relates to ceph
git+https://github.com/openstack/charm-ops-interface-ceph-client#egg=interface_ceph_client git+https://github.com/openstack/charm-ops-interface-ceph-client#egg=interface_ceph_client

76
tox.ini
View File

@ -1,84 +1,63 @@
# Operator charm helper: tox.ini # Operator charm helper: tox.ini
[tox] [tox]
envlist = pep8,py3
skipsdist = True skipsdist = True
# NOTE: Avoid build/test env pollution by not enabling sitepackages. envlist = pep8,py3
sitepackages = False sitepackages = False
# NOTE: Avoid false positives by not skipping missing interpreters.
skip_missing_interpreters = False skip_missing_interpreters = False
# NOTES:
# * We avoid the new dependency resolver by pinning pip < 20.3, see
# https://github.com/pypa/pip/issues/9187
# * Pinning dependencies requires tox >= 3.2.0, see
# https://tox.readthedocs.io/en/latest/config.html#conf-requires
# * It is also necessary to pin virtualenv as a newer virtualenv would still
# lead to fetching the latest pip in the func* tox targets, see
# https://stackoverflow.com/a/38133283
requires = pip < 20.3
virtualenv < 20.0
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
minversion = 3.18.0 minversion = 3.18.0
requires = virtualenv < 20.0
[testenv] [testenv]
setenv = VIRTUAL_ENV={envdir} basepython = python3
PYTHONHASHSEED=0
CHARM_DIR={envdir}
install_command = install_command =
pip install {opts} {packages} pip install {opts} {packages}
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
whitelist_externals = allowlist_externals =
git git
add-to-archive.py
fetch-libs.sh
bash
charmcraft charmcraft
passenv = HOME TERM CS_* OS_* TEST_* fetch-libs.sh
deps = -r{toxinidir}/test-requirements.txt deps =
-r{toxinidir}/test-requirements.txt
[testenv:fetch] [testenv:fetch]
basepython = python3 basepython = python3
deps = deps =
commands = commands =
./fetch-libs.sh {toxinidir}/fetch-libs.sh
[testenv:cookie] [testenv:cookie]
basepython = python3 basepython = python3
deps = -r{toxinidir}/cookie-requirements.txt deps = -r{toxinidir}/cookie-requirements.txt
commands = /bin/true commands = /bin/true
[testenv:py3.8]
basepython = python3.8
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3.9]
basepython = python3.9
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3.10]
basepython = python3.10
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3] [testenv:py3]
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps =
-r{toxinidir}/test-requirements.txt {[testenv]deps}
-r{toxinidir}/requirements.txt
[testenv:py38]
basepython = python3.8
deps = {[testenv:py3]deps}
[testenv:py39]
basepython = python3.9
deps = {[testenv:py3]deps}
[testenv:py310]
basepython = python3.10
deps = {[testenv:py3]deps}
[testenv:pep8] [testenv:pep8]
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps = {[testenv]deps}
-r{toxinidir}/test-requirements.txt commands = flake8 {posargs} unit_tests ops_sunbeam --exclude unit_tests/lib
commands = flake8 {posargs} src unit_tests tests ops_sunbeam --exclude unit_tests/lib
[testenv:cover] [testenv:cover]
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps = {[testenv:py3]deps}
-r{toxinidir}/test-requirements.txt
setenv = setenv =
{[testenv]setenv}
PYTHON=coverage run PYTHON=coverage run
commands = commands =
coverage erase coverage erase
@ -103,5 +82,4 @@ basepython = python3
commands = {posargs} commands = {posargs}
[flake8] [flake8]
# Ignore E902 because the unit_tests directory is missing in the built charm. ignore = E226,E402,ANN101,ANN003,W504
ignore = E402,E226,E902,ANN101,ANN003,W504