From bae091977c71c86b754385bd8d60eb634a294404 Mon Sep 17 00:00:00 2001 From: Leonardo Fagundes Luz Serrano Date: Wed, 21 Dec 2022 06:47:09 -0300 Subject: [PATCH] Standardize app configs Fixed versioning and adjusted some build files to bring them as close to a standard as possible. - Removed centos files - Added version tracking via GITREVCOUNT - Fixed mismatch in plugin name, set to python3-k8sapp- - Standardized plugin debian files (rules, *.install) - Plugin wheels saved to /plugin instead of /plugin/ Test Plan: PASS - Build-pkgs -a PASS - Build-image PASS - Install, bootstrap, unlock PASS - app tarball contains wheel file PASS - wheel versioning updated properly Story: 2010542 Task: 47178 Signed-off-by: Leonardo Fagundes Luz Serrano Change-Id: Ie78d5685b973a30bc253068968b46833952c112b --- .zuul.yaml | 8 +- centos_build_layer.cfg | 1 - centos_iso_image.inc | 1 - centos_pkg_dirs | 2 - centos_pkg_dirs_containers | 2 - centos_stable_docker_images.inc | 1 - debian_pkg_dirs | 2 +- python-k8sapp-snmp/centos/build_srpm.data | 3 - .../centos/python-k8sapp-snmp.spec | 52 ------------ .../python3-k8sapp-snmp-wheels.install | 1 - .../deb_folder/python3-k8sapp-snmp.install | 2 - python-k8sapp-snmp/debian/deb_folder/rules | 26 ------ python-k8sapp-snmp/debian/meta_data.yaml | 7 -- .../debian/deb_folder/changelog | 0 .../debian/deb_folder/control | 0 .../debian/deb_folder/copyright | 0 .../python3-k8sapp-snmp-wheels.install | 1 + .../deb_folder/python3-k8sapp-snmp.install | 1 + python3-k8sapp-snmp/debian/deb_folder/rules | 33 ++++++++ .../debian/deb_folder/source/format | 0 python3-k8sapp-snmp/debian/meta_data.yaml | 9 ++ .../k8sapp_snmp/.gitignore | 0 .../k8sapp_snmp/.stestr.conf | 0 .../k8sapp_snmp/LICENSE | 0 .../k8sapp_snmp/README.rst | 0 .../k8sapp_snmp/k8sapp_snmp/__init__.py | 0 .../k8sapp_snmp/armada/__init__.py | 0 .../k8sapp_snmp/armada/manifest_snmp.py | 0 .../k8sapp_snmp/common/__init__.py | 0 .../k8sapp_snmp/common/constants.py | 0 .../k8sapp_snmp/k8sapp_snmp/helm/__init__.py | 0 .../k8sapp_snmp/k8sapp_snmp/helm/snmp.py | 0 .../k8sapp_snmp/lifecycle/__init__.py | 0 .../k8sapp_snmp/lifecycle/lifecycle_snmp.py | 0 .../k8sapp_snmp/k8sapp_snmp/tests/__init__.py | 0 .../k8sapp_snmp/tests/test_plugins.py | 0 .../k8sapp_snmp/tests/test_snmp.py | 0 .../k8sapp_snmp/pylint.rc | 0 .../k8sapp_snmp/requirements.txt | 0 .../k8sapp_snmp/setup.cfg | 2 +- .../k8sapp_snmp/setup.py | 0 .../k8sapp_snmp/test-requirements.txt | 0 .../k8sapp_snmp/tox.ini | 0 .../k8sapp_snmp/upper-constraints.txt | 0 stx-snmp-helm/centos/build_srpm.data | 7 -- ...-snmp-helm-fm-subagent.stable_docker_image | 4 - ...-helm-fm-trap-subagent.stable_docker_image | 4 - .../stx-snmp-helm-snmp.stable_docker_image | 4 - stx-snmp-helm/centos/stx-snmp-helm.spec | 82 ------------------- stx-snmp-helm/debian/deb_folder/rules | 2 +- stx-snmp-helm/debian/meta_data.yaml | 4 +- .../docker/stx-fm-subagent/Dockerfile.centos | 44 ---------- .../stx-fm-trap-subagent/Dockerfile.centos | 27 ------ .../docker/stx-snmp/Dockerfile.centos | 31 ------- 54 files changed, 54 insertions(+), 309 deletions(-) delete mode 100644 centos_build_layer.cfg delete mode 100644 centos_iso_image.inc delete mode 100644 centos_pkg_dirs delete mode 100644 centos_pkg_dirs_containers delete mode 100644 centos_stable_docker_images.inc delete mode 100644 python-k8sapp-snmp/centos/build_srpm.data delete mode 100644 python-k8sapp-snmp/centos/python-k8sapp-snmp.spec delete mode 100644 python-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp-wheels.install delete mode 100644 python-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp.install delete mode 100755 python-k8sapp-snmp/debian/deb_folder/rules delete mode 100644 python-k8sapp-snmp/debian/meta_data.yaml rename {python-k8sapp-snmp => python3-k8sapp-snmp}/debian/deb_folder/changelog (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/debian/deb_folder/control (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/debian/deb_folder/copyright (100%) create mode 100644 python3-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp-wheels.install create mode 100644 python3-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp.install create mode 100755 python3-k8sapp-snmp/debian/deb_folder/rules rename {python-k8sapp-snmp => python3-k8sapp-snmp}/debian/deb_folder/source/format (100%) create mode 100644 python3-k8sapp-snmp/debian/meta_data.yaml rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/.gitignore (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/.stestr.conf (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/LICENSE (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/README.rst (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/__init__.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/armada/__init__.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/armada/manifest_snmp.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/common/__init__.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/common/constants.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/helm/__init__.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/helm/snmp.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/lifecycle/__init__.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/tests/__init__.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/pylint.rc (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/requirements.txt (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/setup.cfg (98%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/setup.py (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/test-requirements.txt (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/tox.ini (100%) rename {python-k8sapp-snmp => python3-k8sapp-snmp}/k8sapp_snmp/upper-constraints.txt (100%) delete mode 100644 stx-snmp-helm/centos/build_srpm.data delete mode 100755 stx-snmp-helm/centos/stx-snmp-helm-fm-subagent.stable_docker_image delete mode 100755 stx-snmp-helm/centos/stx-snmp-helm-fm-trap-subagent.stable_docker_image delete mode 100755 stx-snmp-helm/centos/stx-snmp-helm-snmp.stable_docker_image delete mode 100644 stx-snmp-helm/centos/stx-snmp-helm.spec delete mode 100644 stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.centos delete mode 100644 stx-snmp-helm/docker/stx-fm-trap-subagent/Dockerfile.centos delete mode 100755 stx-snmp-helm/docker/stx-snmp/Dockerfile.centos diff --git a/.zuul.yaml b/.zuul.yaml index 575d4e0..72c3ec9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -26,11 +26,11 @@ - starlingx/update - starlingx/utilities files: - - python-k8sapp-snmp/k8sapp_snmp/* + - python3-k8sapp-snmp/k8sapp_snmp/* vars: tox_envlist: py39 python_version: 3.9 - tox_extra_args: -c python-k8sapp-snmp/k8sapp_snmp/tox.ini + tox_extra_args: -c python3-k8sapp-snmp/k8sapp_snmp/tox.ini - job: name: stx-snmp-armada-app-upload-git-mirror parent: upload-git-mirror @@ -56,10 +56,10 @@ - starlingx/update - starlingx/utilities files: - - python-k8sapp-snmp/* + - python3-k8sapp-snmp/* vars: tox_envlist: pylint - tox_extra_args: -c python-k8sapp-snmp/k8sapp_snmp/tox.ini + tox_extra_args: -c python3-k8sapp-snmp/k8sapp_snmp/tox.ini - secret: name: stx-snmp-armada-app-github-secret diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg deleted file mode 100644 index c581999..0000000 --- a/centos_build_layer.cfg +++ /dev/null @@ -1 +0,0 @@ -flock diff --git a/centos_iso_image.inc b/centos_iso_image.inc deleted file mode 100644 index b6438ac..0000000 --- a/centos_iso_image.inc +++ /dev/null @@ -1 +0,0 @@ -stx-snmp-helm diff --git a/centos_pkg_dirs b/centos_pkg_dirs deleted file mode 100644 index 6382f5b..0000000 --- a/centos_pkg_dirs +++ /dev/null @@ -1,2 +0,0 @@ -stx-snmp-helm -python-k8sapp-snmp diff --git a/centos_pkg_dirs_containers b/centos_pkg_dirs_containers deleted file mode 100644 index 6382f5b..0000000 --- a/centos_pkg_dirs_containers +++ /dev/null @@ -1,2 +0,0 @@ -stx-snmp-helm -python-k8sapp-snmp diff --git a/centos_stable_docker_images.inc b/centos_stable_docker_images.inc deleted file mode 100644 index b6438ac..0000000 --- a/centos_stable_docker_images.inc +++ /dev/null @@ -1 +0,0 @@ -stx-snmp-helm diff --git a/debian_pkg_dirs b/debian_pkg_dirs index cf2d7b1..89cf9b4 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -1,2 +1,2 @@ -python-k8sapp-snmp +python3-k8sapp-snmp stx-snmp-helm diff --git a/python-k8sapp-snmp/centos/build_srpm.data b/python-k8sapp-snmp/centos/build_srpm.data deleted file mode 100644 index 668a862..0000000 --- a/python-k8sapp-snmp/centos/build_srpm.data +++ /dev/null @@ -1,3 +0,0 @@ -SRC_DIR="k8sapp_snmp" - -TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/python-k8sapp-snmp/centos/python-k8sapp-snmp.spec b/python-k8sapp-snmp/centos/python-k8sapp-snmp.spec deleted file mode 100644 index 1c65733..0000000 --- a/python-k8sapp-snmp/centos/python-k8sapp-snmp.spec +++ /dev/null @@ -1,52 +0,0 @@ -%global app_name snmp -%global pypi_name k8sapp-snmp -%global sname k8sapp_snmp - -Name: python-%{pypi_name} -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -Summary: StarlingX sysinv extensions: Snmp - -License: Apache-2.0 -Source0: %{name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: python-setuptools -BuildRequires: python-pbr -BuildRequires: python2-pip -BuildRequires: python2-wheel - -%description -StarlingX sysinv extensions: SNMP K8S app - -%prep -%setup -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info - -%build -export PBR_VERSION=%{version} -%{__python2} setup.py build - -%py2_build_wheel - -%install -export PBR_VERSION=%{version}.%{tis_patch_ver} -export SKIP_PIP_INSTALL=1 -%{__python2} setup.py install --skip-build --root %{buildroot} -mkdir -p ${RPM_BUILD_ROOT}/plugins/%{app_name} -install -m 644 dist/*.whl ${RPM_BUILD_ROOT}/plugins/%{app_name}/ - -%files -%{python2_sitelib}/%{sname} -%{python2_sitelib}/%{sname}-*.egg-info - -%package wheels -Summary: %{name} wheels - -%description wheels -Contains python wheels for %{name} - -%files wheels -/plugins/* diff --git a/python-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp-wheels.install b/python-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp-wheels.install deleted file mode 100644 index 0fda606..0000000 --- a/python-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp-wheels.install +++ /dev/null @@ -1 +0,0 @@ -plugins/snmp/*.whl diff --git a/python-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp.install b/python-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp.install deleted file mode 100644 index d880f06..0000000 --- a/python-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python3/dist-packages/k8sapp_snmp-1.0.0.egg-info/* -usr/lib/python3/dist-packages/k8sapp_snmp/* diff --git a/python-k8sapp-snmp/debian/deb_folder/rules b/python-k8sapp-snmp/debian/deb_folder/rules deleted file mode 100755 index 96ac3bf..0000000 --- a/python-k8sapp-snmp/debian/deb_folder/rules +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/make -f -# export DH_VERBOSE = 1 - -export APP_NAME=snmp -export PBR_VERSION=1.0.0 -export PYBUILD_NAME=k8sapp-snmp -export ROOT=$(CURDIR)/debian/tmp -export SKIP_PIP_INSTALL=1 - -%: - dh $@ --with=python3 --buildsystem=pybuild - -override_dh_auto_build: - python3 setup.py build - -override_dh_auto_install: - python3 setup.py install --install-layout=deb --skip-build --root $(ROOT) - python3 setup.py bdist_wheel \ - --universal \ - -d $(ROOT)/plugins/$(APP_NAME) - -ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) -override_dh_auto_test: - # (tbogue) FIXME - PYTHONDIR=$(CURDIR) stestr run || true -endif diff --git a/python-k8sapp-snmp/debian/meta_data.yaml b/python-k8sapp-snmp/debian/meta_data.yaml deleted file mode 100644 index aed45f8..0000000 --- a/python-k8sapp-snmp/debian/meta_data.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -debname: python3-k8sapp-snmp -debver: 1.0-1 -src_path: k8sapp_snmp -revision: - dist: $STX_DIST - PKG_GITREVCOUNT: true diff --git a/python-k8sapp-snmp/debian/deb_folder/changelog b/python3-k8sapp-snmp/debian/deb_folder/changelog similarity index 100% rename from python-k8sapp-snmp/debian/deb_folder/changelog rename to python3-k8sapp-snmp/debian/deb_folder/changelog diff --git a/python-k8sapp-snmp/debian/deb_folder/control b/python3-k8sapp-snmp/debian/deb_folder/control similarity index 100% rename from python-k8sapp-snmp/debian/deb_folder/control rename to python3-k8sapp-snmp/debian/deb_folder/control diff --git a/python-k8sapp-snmp/debian/deb_folder/copyright b/python3-k8sapp-snmp/debian/deb_folder/copyright similarity index 100% rename from python-k8sapp-snmp/debian/deb_folder/copyright rename to python3-k8sapp-snmp/debian/deb_folder/copyright diff --git a/python3-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp-wheels.install b/python3-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp-wheels.install new file mode 100644 index 0000000..19a9e4c --- /dev/null +++ b/python3-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp-wheels.install @@ -0,0 +1 @@ +plugins/*.whl diff --git a/python3-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp.install b/python3-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp.install new file mode 100644 index 0000000..91d1d9d --- /dev/null +++ b/python3-k8sapp-snmp/debian/deb_folder/python3-k8sapp-snmp.install @@ -0,0 +1 @@ +usr/lib/python3/dist-packages/k8sapp_* diff --git a/python3-k8sapp-snmp/debian/deb_folder/rules b/python3-k8sapp-snmp/debian/deb_folder/rules new file mode 100755 index 0000000..94f799e --- /dev/null +++ b/python3-k8sapp-snmp/debian/deb_folder/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f +# export DH_VERBOSE = 1 + +export APP_NAME = snmp +export PYBUILD_NAME = k8sapp-snmp + +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/python-k8sapp-snmp/debian/deb_folder/source/format b/python3-k8sapp-snmp/debian/deb_folder/source/format similarity index 100% rename from python-k8sapp-snmp/debian/deb_folder/source/format rename to python3-k8sapp-snmp/debian/deb_folder/source/format diff --git a/python3-k8sapp-snmp/debian/meta_data.yaml b/python3-k8sapp-snmp/debian/meta_data.yaml new file mode 100644 index 0000000..fe3f5da --- /dev/null +++ b/python3-k8sapp-snmp/debian/meta_data.yaml @@ -0,0 +1,9 @@ +--- +debname: python3-k8sapp-snmp +debver: 1.0-1 +src_path: k8sapp_snmp +revision: + dist: $STX_DIST + GITREVCOUNT: + SRC_DIR: ${MY_REPO}/stx/snmp-armada-app + BASE_SRCREV: be277c83a95fecc4f029e7af8844ba9de1f630fb diff --git a/python-k8sapp-snmp/k8sapp_snmp/.gitignore b/python3-k8sapp-snmp/k8sapp_snmp/.gitignore similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/.gitignore rename to python3-k8sapp-snmp/k8sapp_snmp/.gitignore diff --git a/python-k8sapp-snmp/k8sapp_snmp/.stestr.conf b/python3-k8sapp-snmp/k8sapp_snmp/.stestr.conf similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/.stestr.conf rename to python3-k8sapp-snmp/k8sapp_snmp/.stestr.conf diff --git a/python-k8sapp-snmp/k8sapp_snmp/LICENSE b/python3-k8sapp-snmp/k8sapp_snmp/LICENSE similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/LICENSE rename to python3-k8sapp-snmp/k8sapp_snmp/LICENSE diff --git a/python-k8sapp-snmp/k8sapp_snmp/README.rst b/python3-k8sapp-snmp/k8sapp_snmp/README.rst similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/README.rst rename to python3-k8sapp-snmp/k8sapp_snmp/README.rst diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/__init__.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/__init__.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/__init__.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/__init__.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/__init__.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/__init__.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/__init__.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/__init__.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/manifest_snmp.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/manifest_snmp.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/manifest_snmp.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/manifest_snmp.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/common/__init__.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/common/__init__.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/common/__init__.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/common/__init__.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/common/constants.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/common/constants.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/common/constants.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/common/constants.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/__init__.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/__init__.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/__init__.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/__init__.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/snmp.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/snmp.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/snmp.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/snmp.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/__init__.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/__init__.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/__init__.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/__init__.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/lifecycle/lifecycle_snmp.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/__init__.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/__init__.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/__init__.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/__init__.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py rename to python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/pylint.rc b/python3-k8sapp-snmp/k8sapp_snmp/pylint.rc similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/pylint.rc rename to python3-k8sapp-snmp/k8sapp_snmp/pylint.rc diff --git a/python-k8sapp-snmp/k8sapp_snmp/requirements.txt b/python3-k8sapp-snmp/k8sapp_snmp/requirements.txt similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/requirements.txt rename to python3-k8sapp-snmp/k8sapp_snmp/requirements.txt diff --git a/python-k8sapp-snmp/k8sapp_snmp/setup.cfg b/python3-k8sapp-snmp/k8sapp_snmp/setup.cfg similarity index 98% rename from python-k8sapp-snmp/k8sapp_snmp/setup.cfg rename to python3-k8sapp-snmp/k8sapp_snmp/setup.cfg index 0641533..4cf6052 100644 --- a/python-k8sapp-snmp/k8sapp_snmp/setup.cfg +++ b/python3-k8sapp-snmp/k8sapp_snmp/setup.cfg @@ -41,5 +41,5 @@ systemconfig.armada.manifest_ops = systemconfig.app_lifecycle = snmp = k8sapp_snmp.lifecycle.lifecycle_snmp:SnmpAppLifecycleOperator -[wheel] +[bdist_wheel] universal = 1 diff --git a/python-k8sapp-snmp/k8sapp_snmp/setup.py b/python3-k8sapp-snmp/k8sapp_snmp/setup.py similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/setup.py rename to python3-k8sapp-snmp/k8sapp_snmp/setup.py diff --git a/python-k8sapp-snmp/k8sapp_snmp/test-requirements.txt b/python3-k8sapp-snmp/k8sapp_snmp/test-requirements.txt similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/test-requirements.txt rename to python3-k8sapp-snmp/k8sapp_snmp/test-requirements.txt diff --git a/python-k8sapp-snmp/k8sapp_snmp/tox.ini b/python3-k8sapp-snmp/k8sapp_snmp/tox.ini similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/tox.ini rename to python3-k8sapp-snmp/k8sapp_snmp/tox.ini diff --git a/python-k8sapp-snmp/k8sapp_snmp/upper-constraints.txt b/python3-k8sapp-snmp/k8sapp_snmp/upper-constraints.txt similarity index 100% rename from python-k8sapp-snmp/k8sapp_snmp/upper-constraints.txt rename to python3-k8sapp-snmp/k8sapp_snmp/upper-constraints.txt diff --git a/stx-snmp-helm/centos/build_srpm.data b/stx-snmp-helm/centos/build_srpm.data deleted file mode 100644 index 5f71932..0000000 --- a/stx-snmp-helm/centos/build_srpm.data +++ /dev/null @@ -1,7 +0,0 @@ -SRC_DIR="stx-snmp-helm" - -TAR_NAME=helm-charts-snmp-0-1-0 -VERSION=1.0.0 -TAR="$TAR_NAME.tar.gz" - -TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/stx-snmp-helm/centos/stx-snmp-helm-fm-subagent.stable_docker_image b/stx-snmp-helm/centos/stx-snmp-helm-fm-subagent.stable_docker_image deleted file mode 100755 index 1780a9e..0000000 --- a/stx-snmp-helm/centos/stx-snmp-helm-fm-subagent.stable_docker_image +++ /dev/null @@ -1,4 +0,0 @@ -BUILDER=docker -LABEL=stx-fm-subagent -DOCKER_CONTEXT=../docker/stx-fm-subagent -DOCKER_FILE=../docker/stx-fm-subagent/Dockerfile.centos diff --git a/stx-snmp-helm/centos/stx-snmp-helm-fm-trap-subagent.stable_docker_image b/stx-snmp-helm/centos/stx-snmp-helm-fm-trap-subagent.stable_docker_image deleted file mode 100755 index 2a06416..0000000 --- a/stx-snmp-helm/centos/stx-snmp-helm-fm-trap-subagent.stable_docker_image +++ /dev/null @@ -1,4 +0,0 @@ -BUILDER=docker -LABEL=stx-fm-trap-subagent -DOCKER_CONTEXT=../docker/stx-fm-trap-subagent -DOCKER_FILE=../docker/stx-fm-trap-subagent/Dockerfile.centos diff --git a/stx-snmp-helm/centos/stx-snmp-helm-snmp.stable_docker_image b/stx-snmp-helm/centos/stx-snmp-helm-snmp.stable_docker_image deleted file mode 100755 index 6693a2d..0000000 --- a/stx-snmp-helm/centos/stx-snmp-helm-snmp.stable_docker_image +++ /dev/null @@ -1,4 +0,0 @@ -BUILDER=docker -LABEL=stx-snmp -DOCKER_CONTEXT=../docker/stx-snmp -DOCKER_FILE=../docker/stx-snmp/Dockerfile.centos diff --git a/stx-snmp-helm/centos/stx-snmp-helm.spec b/stx-snmp-helm/centos/stx-snmp-helm.spec deleted file mode 100644 index 29bb819..0000000 --- a/stx-snmp-helm/centos/stx-snmp-helm.spec +++ /dev/null @@ -1,82 +0,0 @@ -# Application tunables (maps to metadata) -%global app_name snmp -%global helm_repo stx-platform - -# Install location -%global app_folder /usr/local/share/applications/helm - -# Build variables -%global helm_folder /usr/lib/helm -%global toolkit_version 0.1.0 - -Summary: StarlingX SNMP FluxCD Helm Charts -Name: stx-snmp-helm -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -URL: unknown - -Source0: helm-charts-snmp-0-1-0.tar.gz - -BuildArch: noarch - -BuildRequires: helm -BuildRequires: python-k8sapp-snmp -BuildRequires: python-k8sapp-snmp-wheels - -%description -StarlingX SNMP Helm Charts - -%prep -%setup -n helm-charts-snmp-0-1-0-1.0.0 - -%build - -cd helm-charts -make - -# switch back to source root -cd - - -# Create a chart tarball compliant with sysinv kube-app.py -%define app_staging %{_builddir}/staging -%define app_tarball_fluxcd %{app_name}-%{version}-%{tis_patch_ver}.tgz - -# Setup staging -mkdir -p %{app_staging} -cp files/metadata.yaml %{app_staging} -mkdir -p %{app_staging}/charts -cp helm-charts/*.tgz %{app_staging}/charts - -# Populate metadata -sed -i 's/@APP_NAME@/%{app_name}/g' %{app_staging}/metadata.yaml -sed -i 's/@APP_VERSION@/%{version}-%{tis_patch_ver}/g' %{app_staging}/metadata.yaml -sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml - -# Copy the plugins: installed in the buildroot -mkdir -p %{app_staging}/plugins -cp /plugins/%{app_name}/*.whl %{app_staging}/plugins - -cp -R fluxcd-manifests %{app_staging}/ - -# calculate checksum of all files in app_staging -cd %{app_staging} -find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 -# package fluxcd app -tar -zcf %{_builddir}/%{app_tarball_fluxcd} -C %{app_staging}/ . - -# switch back to source root -cd - - -# Cleanup staging -rm -fr %{app_staging} - -%install -install -d -m 755 %{buildroot}/%{app_folder} -install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder} - -%files -%defattr(-,root,root,-) -%{app_folder}/%{app_tarball_fluxcd} diff --git a/stx-snmp-helm/debian/deb_folder/rules b/stx-snmp-helm/debian/deb_folder/rules index b8d8982..80da401 100755 --- a/stx-snmp-helm/debian/deb_folder/rules +++ b/stx-snmp-helm/debian/deb_folder/rules @@ -44,7 +44,7 @@ override_dh_auto_build: # Copy the plugins: installed in the buildroot mkdir -p $(STAGING_FLUXCD)/plugins - cp /plugins/$(APP_NAME)/*.whl $(STAGING_FLUXCD)/plugins + cp /plugins/*.whl $(STAGING_FLUXCD)/plugins # Create the app package. cd $(STAGING_FLUXCD) && find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 diff --git a/stx-snmp-helm/debian/meta_data.yaml b/stx-snmp-helm/debian/meta_data.yaml index 007c6d7..dacef43 100644 --- a/stx-snmp-helm/debian/meta_data.yaml +++ b/stx-snmp-helm/debian/meta_data.yaml @@ -4,4 +4,6 @@ debver: 1.0-1 src_path: stx-snmp-helm revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + SRC_DIR: ${MY_REPO}/stx/snmp-armada-app + BASE_SRCREV: be277c83a95fecc4f029e7af8844ba9de1f630fb diff --git a/stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.centos b/stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.centos deleted file mode 100644 index 320104b..0000000 --- a/stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.centos +++ /dev/null @@ -1,44 +0,0 @@ -ARG BASE -FROM ${BASE} AS stx -RUN yum -y update -RUN yum -y install\ - fm-common \ - fm-common-dev - -FROM centos:7 AS base -RUN yum -y install\ - net-snmp \ - net-snmp-utils \ - python3-setuptools \ - libpython2.7 \ - python3-devel \ - postgresql - -WORKDIR /home/sub-agent -COPY --from=stx /usr/lib64/libfmcommon.so.1.0 /usr/lib64/ - -RUN ln -s /usr/lib64/libfmcommon.so.1.0 /usr/lib64/libfmcommon.so -RUN ln -s /usr/lib64/libfmcommon.so.1.0 /usr/lib64/libfmcommon.so.1 - -FROM base AS builder -RUN yum -y install\ - net-snmp-libs \ - net-snmp-devel\ - gcc \ - make \ - uuid - -RUN ln -s /usr/lib64/libuuid.so.1.3.0 /usr/lib64/libuuid.so -COPY Makefile . -COPY ./src/* ./src/ -COPY --from=stx /usr/include/fmDbAPI.h /usr/include/ -COPY --from=stx /usr/include/fmAPI.h /usr/include/ -ENV LIB_DIR=/usr/lib64/ -RUN make - - -FROM base AS deployment-env -COPY --from=builder /home/sub-agent/snmpSubAgent . -COPY bootstrap.sh . -RUN chmod 755 bootstrap.sh -ENTRYPOINT ["./bootstrap.sh"] diff --git a/stx-snmp-helm/docker/stx-fm-trap-subagent/Dockerfile.centos b/stx-snmp-helm/docker/stx-fm-trap-subagent/Dockerfile.centos deleted file mode 100644 index 0d6195e..0000000 --- a/stx-snmp-helm/docker/stx-fm-trap-subagent/Dockerfile.centos +++ /dev/null @@ -1,27 +0,0 @@ -FROM centos:8 AS builder -RUN sed -i -e 's%^mirrorlist=%#mirrorlist=%' -e 's%^#baseurl=http://mirror%baseurl=https://vault%' /etc/yum.repos.d/*repo -RUN yum -y update && yum upgrade -RUN yum -y install\ - net-snmp-libs \ - net-snmp-devel \ - make - -RUN dnf -y --enablerepo=powertools install json-c-devel -WORKDIR /home/trapagent -COPY src/* ./src/ -COPY Makefile . -RUN make - - -FROM centos:8 -RUN sed -i -e 's%^mirrorlist=%#mirrorlist=%' -e 's%^#baseurl=http://mirror%baseurl=https://vault%' /etc/yum.repos.d/*repo -RUN yum -y update && yum upgrade -RUN yum -y install\ - net-snmp \ - net-snmp-utils - -WORKDIR /home/trapagent -COPY --from=builder /home/trapagent/wrsAlarmMIB . -COPY bootstrap.sh . -RUN chmod 755 ./bootstrap.sh -ENTRYPOINT ["./bootstrap.sh"] diff --git a/stx-snmp-helm/docker/stx-snmp/Dockerfile.centos b/stx-snmp-helm/docker/stx-snmp/Dockerfile.centos deleted file mode 100755 index ed94b49..0000000 --- a/stx-snmp-helm/docker/stx-snmp/Dockerfile.centos +++ /dev/null @@ -1,31 +0,0 @@ -FROM centos:8 AS builder -RUN sed -i -e 's%^mirrorlist=%#mirrorlist=%' -e 's%^#baseurl=http://mirror%baseurl=https://vault%' /etc/yum.repos.d/*repo -RUN yum -y update -RUN yum -y upgrade -RUN yum -y install \ - net-snmp-libs \ - net-snmp-devel \ - libuuid\ - gcc\ - make -RUN ln -s /usr/lib64/libuuid.so.1.3.0 /usr/lib64/libuuid.so -WORKDIR /home -COPY ./src/* /home/src/ -WORKDIR /home/src/ -RUN make -f Makefile - -FROM centos:8 -RUN sed -i -e 's%^mirrorlist=%#mirrorlist=%' -e 's%^#baseurl=http://mirror%baseurl=https://vault%' /etc/yum.repos.d/*repo -RUN yum -y update -RUN yum -y upgrade -RUN yum -y install\ - net-snmp \ - net-snmp-utils \ - net-snmp-libs - -COPY ./mibs/* /usr/share/snmp/mibs/ -COPY --from=builder /home/src/libsnmpAuditPlugin.so /usr/lib64/ -EXPOSE 161/udp -EXPOSE 162/udp -EXPOSE 705/tcp -CMD /usr/sbin/snmpd $OPTIONDEBUG -f