Standardize app configs

Adjusted some build files to bring them
as close to a standard as possible.

- Added version tracking via GITREVCOUNT
- Fixed mismatch in plugin name, set to python3-k8sapp-<app>
- Standardized plugin debian files (rules, *.install)

Test Plan:
PASS - Build-pkgs -a
PASS - wheel versioning updated properly

Story: 2010542
Task: 47182

Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com>
Change-Id: I07459c426c835b19df67d7ab4f86d402339d6ab3

.zuul.yaml

@@ -29,11 +29,11 @@
       - starlingx/update
       - starlingx/utilities
     files:
-        - python-k8sapp-openstack/k8sapp_openstack/*
+        - python3-k8sapp-openstack/k8sapp_openstack/*
     vars:
         tox_envlist: py36
         python_version: 3.6
-        tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
+        tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
 - job:
     name: k8sapp-openstack-tox-py39
     parent: tox-py39
@@ -46,11 +46,11 @@
       - starlingx/update
       - starlingx/utilities
     files:
-        - python-k8sapp-openstack/k8sapp_openstack/*
+        - python3-k8sapp-openstack/k8sapp_openstack/*
     vars:
         tox_envlist: py39
         python_version: 3.9
-        tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
+        tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
 - job:
     name: stx-openstack-armada-app-upload-git-mirror
     parent: upload-git-mirror
@@ -75,10 +75,10 @@
       - starlingx/update
       - starlingx/utilities
     files:
-      - python-k8sapp-openstack/*
+      - python3-k8sapp-openstack/*
     vars:
       tox_envlist: pylint
-      tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
+      tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
 
 - job:
     name: k8sapp-openstack-tox-pep8
@@ -92,10 +92,10 @@
       - starlingx/update
       - starlingx/utilities
     files:
-      - python-k8sapp-openstack/*
+      - python3-k8sapp-openstack/*
     vars:
       tox_envlist: pep8
-      tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
+      tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
 
 - secret:
     name: stx-openstack-armada-app-github-secret

debian_pkg_dirs

@@ -1,5 +1,5 @@
 openstack-helm
 openstack-helm-infra
-python-k8sapp-openstack
+python3-k8sapp-openstack
 stx-openstack-helm
 stx-openstack-helm-fluxcd

python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install

@@ -1,2 +0,0 @@
-usr/lib/python3/dist-packages/k8sapp_openstack-1.0.0.egg-info/*
-usr/lib/python3/dist-packages/k8sapp_openstack/*

python-k8sapp-openstack/debian/deb_folder/rules

@@ -1,26 +0,0 @@
-#!/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

python-k8sapp-openstack/debian/meta_data.yaml

@@ -1,7 +0,0 @@
----
-debname: python3-k8sapp-openstack
-debver: 1.0-1
-src_path: k8sapp_openstack
-revision:
-  dist: $STX_DIST
-  PKG_GITREVCOUNT: true

python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install

@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/k8sapp_*

python3-k8sapp-openstack/debian/deb_folder/rules

@@ -0,0 +1,33 @@
+#!/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

python3-k8sapp-openstack/debian/meta_data.yaml

@@ -0,0 +1,9 @@
+---
+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

python3-k8sapp-openstack/k8sapp_openstack/setup.cfg

@@ -72,5 +72,5 @@ systemconfig.armada.manifest_ops =
 systemconfig.app_lifecycle =
     openstack = k8sapp_openstack.lifecycle.lifecycle_openstack:OpenstackAppLifecycleOperator
 
-[wheel]
+[bdist_wheel]
 universal = 1

stx-openstack-helm-fluxcd/debian/meta_data.yaml

@@ -7,4 +7,6 @@ src_files:
   - ${MY_REPO}/stx/helm-charts/fm-rest-api/fm-rest-api/helm-charts
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    SRC_DIR: ${MY_REPO}/stx/openstack-armada-app
+    BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827

stx-openstack-helm/debian/meta_data.yaml

@@ -7,4 +7,6 @@ src_files:
   - ${MY_REPO}/stx/helm-charts/fm-rest-api/fm-rest-api/helm-charts
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    SRC_DIR: ${MY_REPO}/stx/openstack-armada-app
+    BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827