diff --git a/.zuul.yaml b/.zuul.yaml index 95466f3d..9e15dbd3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -13,6 +13,7 @@ - k8sapp-openstack-tox-py36 - k8sapp-openstack-tox-py39 - k8sapp-openstack-tox-pylint + - k8sapp-openstack-tox-pep8 post: jobs: - stx-openstack-armada-app-upload-git-mirror @@ -29,11 +30,11 @@ - starlingx/update - starlingx/utilities files: - - python3-k8sapp-openstack/k8sapp_openstack/* + - python-k8sapp-openstack/k8sapp_openstack/* vars: tox_envlist: py36 python_version: 3.6 - tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini + tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini - job: name: k8sapp-openstack-tox-py39 parent: tox-py39 @@ -46,11 +47,11 @@ - starlingx/update - starlingx/utilities files: - - python3-k8sapp-openstack/k8sapp_openstack/* + - python-k8sapp-openstack/k8sapp_openstack/* vars: tox_envlist: py39 python_version: 3.9 - tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini + tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini - job: name: stx-openstack-armada-app-upload-git-mirror parent: upload-git-mirror @@ -68,17 +69,17 @@ parent: tox description: | Run pylint tests for k8sapp_oidc - nodeset: ubuntu-bionic + nodeset: debian-bullseye required-projects: - starlingx/config - starlingx/fault - starlingx/update - starlingx/utilities files: - - python3-k8sapp-openstack/* + - python-k8sapp-openstack/* vars: tox_envlist: pylint - tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini + tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini - job: name: k8sapp-openstack-tox-pep8 @@ -92,10 +93,10 @@ - starlingx/update - starlingx/utilities files: - - python3-k8sapp-openstack/* + - python-k8sapp-openstack/* vars: tox_envlist: pep8 - tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini + tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini - secret: name: stx-openstack-armada-app-github-secret diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 24746786..d1a9b0c4 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -1,5 +1,5 @@ openstack-helm openstack-helm-infra -python3-k8sapp-openstack +python-k8sapp-openstack stx-openstack-helm stx-openstack-helm-fluxcd diff --git a/python3-k8sapp-openstack/centos/build_srpm.data b/python-k8sapp-openstack/centos/build_srpm.data similarity index 100% rename from python3-k8sapp-openstack/centos/build_srpm.data rename to python-k8sapp-openstack/centos/build_srpm.data diff --git a/python3-k8sapp-openstack/centos/python-k8sapp-openstack.spec b/python-k8sapp-openstack/centos/python-k8sapp-openstack.spec similarity index 100% rename from python3-k8sapp-openstack/centos/python-k8sapp-openstack.spec rename to python-k8sapp-openstack/centos/python-k8sapp-openstack.spec diff --git a/python3-k8sapp-openstack/debian/deb_folder/changelog b/python-k8sapp-openstack/debian/deb_folder/changelog similarity index 100% rename from python3-k8sapp-openstack/debian/deb_folder/changelog rename to python-k8sapp-openstack/debian/deb_folder/changelog diff --git a/python3-k8sapp-openstack/debian/deb_folder/control b/python-k8sapp-openstack/debian/deb_folder/control similarity index 100% rename from python3-k8sapp-openstack/debian/deb_folder/control rename to python-k8sapp-openstack/debian/deb_folder/control diff --git a/python3-k8sapp-openstack/debian/deb_folder/copyright b/python-k8sapp-openstack/debian/deb_folder/copyright similarity index 100% rename from python3-k8sapp-openstack/debian/deb_folder/copyright rename to python-k8sapp-openstack/debian/deb_folder/copyright diff --git a/python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install b/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install similarity index 100% rename from python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install rename to python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install diff --git a/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install b/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install new file mode 100644 index 00000000..e8bdd3aa --- /dev/null +++ b/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install @@ -0,0 +1,2 @@ +usr/lib/python3/dist-packages/k8sapp_openstack-1.0.0.egg-info/* +usr/lib/python3/dist-packages/k8sapp_openstack/* diff --git a/python-k8sapp-openstack/debian/deb_folder/rules b/python-k8sapp-openstack/debian/deb_folder/rules new file mode 100755 index 00000000..8b48dca9 --- /dev/null +++ b/python-k8sapp-openstack/debian/deb_folder/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f +# export DH_VERBOSE = 1 + +export APP_NAME=k8sapp-openstack +export PBR_VERSION=1.0.0 +export PYBUILD_NAME=k8sapp-openstack +export SKIP_PIP_INSTALL=1 +export ROOT=debian/tmp + +%: + dh $@ --with=python3 --buildsystem=pybuild + +override_dh_auto_install: + python3 setup.py install --install-layout=deb --root $(ROOT) + python3 setup.py bdist_wheel \ + --universal \ + -d $(ROOT)/plugins + +override_dh_python3: + dh_python3 --shebang=/usr/bin/python3 + +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) +override_dh_auto_test: + # (tbogue) FIXME + PYTHONDIR=$(CURDIR) stestr run || true +endif diff --git a/python3-k8sapp-openstack/debian/deb_folder/source/format b/python-k8sapp-openstack/debian/deb_folder/source/format similarity index 100% rename from python3-k8sapp-openstack/debian/deb_folder/source/format rename to python-k8sapp-openstack/debian/deb_folder/source/format diff --git a/python-k8sapp-openstack/debian/meta_data.yaml b/python-k8sapp-openstack/debian/meta_data.yaml new file mode 100644 index 00000000..6e8e8e51 --- /dev/null +++ b/python-k8sapp-openstack/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: python3-k8sapp-openstack +debver: 1.0-1 +src_path: k8sapp_openstack +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/python3-k8sapp-openstack/k8sapp_openstack/.gitignore b/python-k8sapp-openstack/k8sapp_openstack/.gitignore similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/.gitignore rename to python-k8sapp-openstack/k8sapp_openstack/.gitignore diff --git a/python3-k8sapp-openstack/k8sapp_openstack/.stestr.conf b/python-k8sapp-openstack/k8sapp_openstack/.stestr.conf similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/.stestr.conf rename to python-k8sapp-openstack/k8sapp_openstack/.stestr.conf diff --git a/python3-k8sapp-openstack/k8sapp_openstack/LICENSE b/python-k8sapp-openstack/k8sapp_openstack/LICENSE similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/LICENSE rename to python-k8sapp-openstack/k8sapp_openstack/LICENSE diff --git a/python3-k8sapp-openstack/k8sapp_openstack/README.rst b/python-k8sapp-openstack/k8sapp_openstack/README.rst similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/README.rst rename to python-k8sapp-openstack/k8sapp_openstack/README.rst diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/dcdbsync.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/dcdbsync.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/dcdbsync.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/dcdbsync.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/garbd.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/garbd.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/garbd.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/garbd.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/helm_toolkit.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/helm_toolkit.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/helm_toolkit.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/helm_toolkit.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/horizon.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/horizon.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/horizon.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/horizon.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/libvirt.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/libvirt.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/libvirt.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/libvirt.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/memcached.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/memcached.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/memcached.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/memcached.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nginx_ports_control.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nginx_ports_control.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nginx_ports_control.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nginx_ports_control.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openstack.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openstack.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openstack.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openstack.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openvswitch.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openvswitch.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openvswitch.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openvswitch.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/pci_irq_affinity_agent.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/pci_irq_affinity_agent.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/pci_irq_affinity_agent.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/pci_irq_affinity_agent.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/psp_rolebinding.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/psp_rolebinding.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/psp_rolebinding.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/psp_rolebinding.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/rabbitmq.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/rabbitmq.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/rabbitmq.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/rabbitmq.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/kustomize_openstack.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/kustomize_openstack.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/kustomize_openstack.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/kustomize_openstack.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_aodh.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_aodh.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_aodh.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_aodh.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_barbican.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_barbican.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_barbican.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_barbican.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ceilometer.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ceilometer.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ceilometer.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ceilometer.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_cinder.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_cinder.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_cinder.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_cinder.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_fm_rest_api.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_fm_rest_api.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_fm_rest_api.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_fm_rest_api.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_glance.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_glance.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_glance.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_glance.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_gnocchi.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_gnocchi.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_gnocchi.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_gnocchi.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_horizon.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_horizon.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_horizon.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_horizon.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ironic.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ironic.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ironic.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ironic.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone_api_proxy.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone_api_proxy.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone_api_proxy.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone_api_proxy.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_neutron.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_neutron.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_neutron.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_neutron.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova_api_proxy.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova_api_proxy.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova_api_proxy.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova_api_proxy.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_placement.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_placement.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_placement.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_placement.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/test_lifecycle_openstack.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/test_lifecycle_openstack.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/test_lifecycle_openstack.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/test_lifecycle_openstack.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_nova_api_proxy.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_nova_api_proxy.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_nova_api_proxy.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_nova_api_proxy.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_plugins.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_plugins.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_plugins.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_plugins.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/__init__.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/__init__.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/__init__.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/__init__.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/test_utils.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/test_utils.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/test_utils.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/test_utils.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/utils.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/utils.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/utils.py rename to python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/utils.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/pylint.rc b/python-k8sapp-openstack/k8sapp_openstack/pylint.rc similarity index 98% rename from python3-k8sapp-openstack/k8sapp_openstack/pylint.rc rename to python-k8sapp-openstack/k8sapp_openstack/pylint.rc index 1acd3c51..bd23e3df 100755 --- a/python3-k8sapp-openstack/k8sapp_openstack/pylint.rc +++ b/python-k8sapp-openstack/k8sapp_openstack/pylint.rc @@ -171,11 +171,13 @@ enable=E1603,E1609,E1610,E1602,E1606,E1608,E1607,E1605,E1604,E1601,E1611,W1652, # E1121: too-many-function-args # Disable Python3 checkers: # W1618: no-absolute-import +# Adding some other checkers temporarily W0707, W1406, W1514 disable=C, R, fixme, W0101, W0105, W0106, W0107, W0108, W0110, W0123, W0150, W0201, W0211, W0212, W0221, W0223, W0231, W0235, W0311, W0402, W0403, W0404, W0603, W0612, W0613, W0621, W0622, W0631, W0632, W0701, W0703, W1113, W1201, W1401, W1505, W1618, - E0213, E0401, E0604, E0633, E0701, E1102, E1120, E1121 + E0213, E0401, E0604, E0633, E0701, E1102, E1120, E1121, + W0707, W1406, W1514 [REPORTS] # Set the output format. Available formats are text, parseable, colorized, msvs diff --git a/python3-k8sapp-openstack/k8sapp_openstack/requirements.txt b/python-k8sapp-openstack/k8sapp_openstack/requirements.txt similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/requirements.txt rename to python-k8sapp-openstack/k8sapp_openstack/requirements.txt diff --git a/python3-k8sapp-openstack/k8sapp_openstack/setup.cfg b/python-k8sapp-openstack/k8sapp_openstack/setup.cfg similarity index 99% rename from python3-k8sapp-openstack/k8sapp_openstack/setup.cfg rename to python-k8sapp-openstack/k8sapp_openstack/setup.cfg index c22d9468..02db63ec 100644 --- a/python3-k8sapp-openstack/k8sapp_openstack/setup.cfg +++ b/python-k8sapp-openstack/k8sapp_openstack/setup.cfg @@ -72,5 +72,5 @@ systemconfig.armada.manifest_ops = systemconfig.app_lifecycle = openstack = k8sapp_openstack.lifecycle.lifecycle_openstack:OpenstackAppLifecycleOperator -[bdist_wheel] +[wheel] universal = 1 diff --git a/python3-k8sapp-openstack/k8sapp_openstack/setup.py b/python-k8sapp-openstack/k8sapp_openstack/setup.py similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/setup.py rename to python-k8sapp-openstack/k8sapp_openstack/setup.py diff --git a/python3-k8sapp-openstack/k8sapp_openstack/test-requirements.txt b/python-k8sapp-openstack/k8sapp_openstack/test-requirements.txt similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/test-requirements.txt rename to python-k8sapp-openstack/k8sapp_openstack/test-requirements.txt diff --git a/python3-k8sapp-openstack/k8sapp_openstack/tox.ini b/python-k8sapp-openstack/k8sapp_openstack/tox.ini similarity index 96% rename from python3-k8sapp-openstack/k8sapp_openstack/tox.ini rename to python-k8sapp-openstack/k8sapp_openstack/tox.ini index eda9cd0e..a1e7bd10 100644 --- a/python3-k8sapp-openstack/k8sapp_openstack/tox.ini +++ b/python-k8sapp-openstack/k8sapp_openstack/tox.ini @@ -183,15 +183,9 @@ deps = -r{toxinidir}/test-requirements.txt commands = bandit --ini tox.ini -n 5 -r k8sapp_openstack [testenv:pylint] -basepython = python2.7 sitepackages = False deps = {[testenv]deps} - pylint -install_command = pip install \ - -v -v -v \ - -c{toxinidir}/upper-constraints.txt \ - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \ - {opts} {packages} + pylint<2.16 commands = pylint {posargs} k8sapp_openstack --rcfile=./pylint.rc diff --git a/python3-k8sapp-openstack/k8sapp_openstack/upper-constraints.txt b/python-k8sapp-openstack/k8sapp_openstack/upper-constraints.txt similarity index 100% rename from python3-k8sapp-openstack/k8sapp_openstack/upper-constraints.txt rename to python-k8sapp-openstack/k8sapp_openstack/upper-constraints.txt diff --git a/python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install b/python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install deleted file mode 100644 index 91d1d9d1..00000000 --- a/python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3/dist-packages/k8sapp_* diff --git a/python3-k8sapp-openstack/debian/deb_folder/rules b/python3-k8sapp-openstack/debian/deb_folder/rules deleted file mode 100755 index e0da7010..00000000 --- a/python3-k8sapp-openstack/debian/deb_folder/rules +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/make -f -# export DH_VERBOSE = 1 - -export APP_NAME = k8sapp-openstack -export PYBUILD_NAME = k8sapp-openstack - -export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -export MAJOR = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-') -export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.') -export PBR_VERSION = $(MAJOR).$(MINOR_PATCH) - -export ROOT = $(CURDIR)/debian/tmp -export SKIP_PIP_INSTALL = 1 - -%: - dh $@ --with=python3 --buildsystem=pybuild - -override_dh_auto_install: - env | sort - - python3 setup.py install \ - --install-layout=deb \ - --root $(ROOT) - - python3 setup.py bdist_wheel \ - --universal \ - -d $(ROOT)/plugins - -override_dh_python3: - dh_python3 --shebang=/usr/bin/python3 - -override_dh_auto_test: - PYTHONDIR=$(CURDIR) stestr run diff --git a/python3-k8sapp-openstack/debian/meta_data.yaml b/python3-k8sapp-openstack/debian/meta_data.yaml deleted file mode 100644 index caa9b728..00000000 --- a/python3-k8sapp-openstack/debian/meta_data.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -debname: python3-k8sapp-openstack -debver: 1.0-1 -src_path: k8sapp_openstack -revision: - dist: $STX_DIST - GITREVCOUNT: - SRC_DIR: ${MY_REPO}/stx/openstack-armada-app - BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827 diff --git a/stx-openstack-helm-fluxcd/debian/meta_data.yaml b/stx-openstack-helm-fluxcd/debian/meta_data.yaml index a047420b..c42f75da 100644 --- a/stx-openstack-helm-fluxcd/debian/meta_data.yaml +++ b/stx-openstack-helm-fluxcd/debian/meta_data.yaml @@ -7,6 +7,4 @@ src_files: - ${MY_REPO}/stx/helm-charts/fm-rest-api/fm-rest-api/helm-charts revision: dist: $STX_DIST - GITREVCOUNT: - SRC_DIR: ${MY_REPO}/stx/openstack-armada-app - BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827 + PKG_GITREVCOUNT: true diff --git a/stx-openstack-helm/debian/meta_data.yaml b/stx-openstack-helm/debian/meta_data.yaml index 93227864..5250d2ff 100644 --- a/stx-openstack-helm/debian/meta_data.yaml +++ b/stx-openstack-helm/debian/meta_data.yaml @@ -7,6 +7,4 @@ src_files: - ${MY_REPO}/stx/helm-charts/fm-rest-api/fm-rest-api/helm-charts revision: dist: $STX_DIST - GITREVCOUNT: - SRC_DIR: ${MY_REPO}/stx/openstack-armada-app - BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827 + PKG_GITREVCOUNT: true