From f8984796e3e4b1e719e9e535732a5aa2b20854c8 Mon Sep 17 00:00:00 2001 From: Leonardo Fagundes Luz Serrano Date: Wed, 21 Dec 2022 06:46:35 -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: 47186 Signed-off-by: Leonardo Fagundes Luz Serrano Change-Id: I0e8e26d3baf364a8bd6b2e7b9e23c7dd3d91634b --- .zuul.yaml | 4 +- centos_build_layer.cfg | 1 - centos_iso_image.inc | 1 - centos_pkg_dirs | 2 - centos_pkg_dirs_containers | 2 - debian_pkg_dirs | 2 +- locationservice-base/centos/Dockerfile | 23 ----- .../locationservice-base.stable_docker_image | 4 - notificationclient-base/centos/Dockerfile | 24 ----- ...otificationclient-base.stable_docker_image | 4 - notificationservice-base/centos/Dockerfile | 23 ----- .../centos/build_srpm.data | 9 -- .../python-k8sapp-ptp-notification.spec | 52 ----------- ...on3-k8sapp-ptp-notification-wheels.install | 1 - .../python3-k8sapp-ptp-notification.install | 2 - .../debian/deb_folder/rules | 26 ------ .../debian/meta_data.yaml | 7 -- .../debian/deb_folder/changelog | 0 .../debian/deb_folder/control | 0 .../debian/deb_folder/copyright | 0 ...on3-k8sapp-ptp-notification-wheels.install | 1 + .../python3-k8sapp-ptp-notification.install | 1 + .../debian/deb_folder/rules | 33 +++++++ .../debian/deb_folder/source/format | 0 .../debian/meta_data.yaml | 9 ++ .../k8sapp_ptp_notification/.gitignore | 0 .../k8sapp_ptp_notification/.stestr.conf | 0 .../k8sapp_ptp_notification/LICENSE | 0 .../k8sapp_ptp_notification/README.rst | 0 .../k8sapp_ptp_notification/__init__.py | 0 .../armada/__init__.py | 0 .../armada/manifest_ptp_notification.py | 0 .../common/__init__.py | 0 .../common/constants.py | 0 .../k8sapp_ptp_notification/helm/__init__.py | 0 .../helm/psp_rolebinding.py | 0 .../helm/ptp_notification.py | 0 .../k8sapp_ptp_notification/tests/__init__.py | 0 .../tests/test_plugins.py | 0 .../k8sapp_ptp_notification/tests/test_ptp.py | 0 .../k8sapp_ptp_notification/pylint.rc | 0 .../k8sapp_ptp_notification/requirements.txt | 0 .../k8sapp_ptp_notification/setup.cfg | 3 +- .../k8sapp_ptp_notification/setup.py | 0 .../test-requirements.txt | 0 .../k8sapp_ptp_notification/tox.ini | 0 .../upper-constraints.txt | 0 .../centos/build_srpm.data | 11 --- .../centos/stx-ptp-notification-helm.spec | 93 ------------------- .../debian/deb_folder/rules | 2 +- .../debian/meta_data.yaml | 4 +- 51 files changed, 53 insertions(+), 291 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 locationservice-base/centos/Dockerfile delete mode 100644 locationservice-base/centos/locationservice-base.stable_docker_image delete mode 100644 notificationclient-base/centos/Dockerfile delete mode 100644 notificationclient-base/centos/notificationclient-base.stable_docker_image delete mode 100644 notificationservice-base/centos/Dockerfile delete mode 100644 python-k8sapp-ptp-notification/centos/build_srpm.data delete mode 100644 python-k8sapp-ptp-notification/centos/python-k8sapp-ptp-notification.spec delete mode 100644 python-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification-wheels.install delete mode 100644 python-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification.install delete mode 100755 python-k8sapp-ptp-notification/debian/deb_folder/rules delete mode 100644 python-k8sapp-ptp-notification/debian/meta_data.yaml rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/debian/deb_folder/changelog (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/debian/deb_folder/control (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/debian/deb_folder/copyright (100%) create mode 100644 python3-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification-wheels.install create mode 100644 python3-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification.install create mode 100755 python3-k8sapp-ptp-notification/debian/deb_folder/rules rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/debian/deb_folder/source/format (100%) create mode 100644 python3-k8sapp-ptp-notification/debian/meta_data.yaml rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/.gitignore (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/.stestr.conf (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/LICENSE (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/README.rst (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/__init__.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/__init__.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/manifest_ptp_notification.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/common/__init__.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/common/constants.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/__init__.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/psp_rolebinding.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/ptp_notification.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/__init__.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_plugins.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_ptp.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/pylint.rc (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/requirements.txt (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/setup.cfg (98%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/setup.py (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/test-requirements.txt (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/tox.ini (100%) rename {python-k8sapp-ptp-notification => python3-k8sapp-ptp-notification}/k8sapp_ptp_notification/upper-constraints.txt (100%) delete mode 100644 stx-ptp-notification-helm/centos/build_srpm.data delete mode 100644 stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec diff --git a/.zuul.yaml b/.zuul.yaml index 846e25c..dc6fecb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -52,10 +52,10 @@ - starlingx/update - starlingx/utilities files: - - python-k8sapp-ptp-notification/* + - python3-k8sapp-ptp-notification/* vars: tox_envlist: pylint - tox_extra_args: -c python-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini + tox_extra_args: -c python3-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini - secret: name: stx-ptp-notification-armada-app-github-secret diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg deleted file mode 100644 index fde92ef..0000000 --- a/centos_build_layer.cfg +++ /dev/null @@ -1 +0,0 @@ -flock \ No newline at end of file diff --git a/centos_iso_image.inc b/centos_iso_image.inc deleted file mode 100644 index ca68b37..0000000 --- a/centos_iso_image.inc +++ /dev/null @@ -1 +0,0 @@ -stx-ptp-notification-helm diff --git a/centos_pkg_dirs b/centos_pkg_dirs deleted file mode 100644 index fec07f3..0000000 --- a/centos_pkg_dirs +++ /dev/null @@ -1,2 +0,0 @@ -stx-ptp-notification-helm -python-k8sapp-ptp-notification \ No newline at end of file diff --git a/centos_pkg_dirs_containers b/centos_pkg_dirs_containers deleted file mode 100644 index fec07f3..0000000 --- a/centos_pkg_dirs_containers +++ /dev/null @@ -1,2 +0,0 @@ -stx-ptp-notification-helm -python-k8sapp-ptp-notification \ No newline at end of file diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 9dfdcb0..d8814c6 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -1,2 +1,2 @@ -python-k8sapp-ptp-notification +python3-k8sapp-ptp-notification stx-ptp-notification-helm diff --git a/locationservice-base/centos/Dockerfile b/locationservice-base/centos/Dockerfile deleted file mode 100644 index dd41bc5..0000000 --- a/locationservice-base/centos/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -ARG BASE -FROM ${BASE} - -ARG STX_REPO_FILE=/etc/yum.repos.d/stx.repo - -ENV KUBE_LATEST_VERSION="v1.23.1" - -RUN set -ex ;\ - yum install --disablerepo=* \ - $(grep '^name=' ${STX_REPO_FILE} | awk -F '=' '{printf "--enablerepo=" $2 " "}') \ - -y \ - gcc python3-devel python3-pip \ - && pip3 install --upgrade pip \ - && pip3 install --user pecan \ - && pip3 install oslo-config \ - && pip3 install oslo-messaging \ - && pip3 install WSME - -WORKDIR /opt/ -COPY ./locationservice /opt/locationservice -RUN cd /opt/locationservice && python3 setup.py develop - -CMD ["bash"] diff --git a/locationservice-base/centos/locationservice-base.stable_docker_image b/locationservice-base/centos/locationservice-base.stable_docker_image deleted file mode 100644 index 14a7c07..0000000 --- a/locationservice-base/centos/locationservice-base.stable_docker_image +++ /dev/null @@ -1,4 +0,0 @@ -BUILDER=docker -LABEL=locationservice-base -DOCKER_CONTEXT=../docker -DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/notificationclient-base/centos/Dockerfile b/notificationclient-base/centos/Dockerfile deleted file mode 100644 index e898387..0000000 --- a/notificationclient-base/centos/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -ARG BASE -FROM ${BASE} - -ARG STX_REPO_FILE=/etc/yum.repos.d/stx.repo - -ENV KUBE_LATEST_VERSION="v1.23.1" - -RUN set -ex ;\ - yum install --disablerepo=* \ - $(grep '^name=' ${STX_REPO_FILE} | awk -F '=' '{printf "--enablerepo=" $2 " "}') \ - -y \ - gcc python3-devel python3-pip \ - && pip3 install --upgrade pip \ - && pip3 install --user pecan \ - && pip3 install oslo-config \ - && pip3 install oslo-messaging \ - && pip3 install WSME \ - && pip3 install sqlalchemy - -WORKDIR /opt/ -COPY ./notificationclient-sidecar /opt/notificationclient -RUN cd /opt/notificationclient && python3 setup.py develop - -CMD ["bash"] diff --git a/notificationclient-base/centos/notificationclient-base.stable_docker_image b/notificationclient-base/centos/notificationclient-base.stable_docker_image deleted file mode 100644 index 1b019d1..0000000 --- a/notificationclient-base/centos/notificationclient-base.stable_docker_image +++ /dev/null @@ -1,4 +0,0 @@ -BUILDER=docker -LABEL=notificationclient-base -DOCKER_CONTEXT=../docker -DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/notificationservice-base/centos/Dockerfile b/notificationservice-base/centos/Dockerfile deleted file mode 100644 index 01339eb..0000000 --- a/notificationservice-base/centos/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -ARG BASE -FROM ${BASE} - -ARG STX_REPO_FILE=/etc/yum.repos.d/stx.repo - -ENV KUBE_LATEST_VERSION="v1.23.1" - -RUN set -ex ;\ - yum install --disablerepo=* \ - $(grep '^name=' ${STX_REPO_FILE} | awk -F '=' '{printf "--enablerepo=" $2 " "}') \ - -y \ - gcc python3-devel python3-pip \ - && pip3 install --upgrade pip \ - && pip3 install --user pecan \ - && pip3 install oslo-config \ - && pip3 install oslo-messaging \ - && pip3 install WSME - -WORKDIR /opt/ -COPY ./ptptrackingfunction /opt/ptptrackingfunction -RUN cd /opt/ptptrackingfunction && python3 setup.py develop - -CMD ["bash"] diff --git a/python-k8sapp-ptp-notification/centos/build_srpm.data b/python-k8sapp-ptp-notification/centos/build_srpm.data deleted file mode 100644 index 33cea35..0000000 --- a/python-k8sapp-ptp-notification/centos/build_srpm.data +++ /dev/null @@ -1,9 +0,0 @@ -SRC_DIR="k8sapp_ptp_notification" - -OPT_DEP_LIST="$STX_BASE/ptp-notification-armada-app/stx-ptp-notification-helm" - -# Keep the SRCREV in sync with stx-vault-helm so the app version is the -# same as the plugin version - -TIS_BASE_SRCREV=c525a7fe479103bc316792c11b5289ebcca8a2a7 -TIS_PATCH_VER=GITREVCOUNT \ No newline at end of file diff --git a/python-k8sapp-ptp-notification/centos/python-k8sapp-ptp-notification.spec b/python-k8sapp-ptp-notification/centos/python-k8sapp-ptp-notification.spec deleted file mode 100644 index 9a14fb1..0000000 --- a/python-k8sapp-ptp-notification/centos/python-k8sapp-ptp-notification.spec +++ /dev/null @@ -1,52 +0,0 @@ -%global app_name ptp-notification -%global pypi_name k8sapp-ptp-notification -%global sname k8sapp_ptp_notification - -Name: python-%{pypi_name} -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -Summary: StarlingX sysinv extensions: ptp-notification - -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: PTP Notification 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-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification-wheels.install b/python-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification-wheels.install deleted file mode 100644 index 027812a..0000000 --- a/python-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification-wheels.install +++ /dev/null @@ -1 +0,0 @@ -plugins/ptp-notification/*.whl diff --git a/python-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification.install b/python-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification.install deleted file mode 100644 index 97f96c2..0000000 --- a/python-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python3/dist-packages/k8sapp_ptp_notification-1.0.0.egg-info/* -usr/lib/python3/dist-packages/k8sapp_ptp_notification/* diff --git a/python-k8sapp-ptp-notification/debian/deb_folder/rules b/python-k8sapp-ptp-notification/debian/deb_folder/rules deleted file mode 100755 index 4809157..0000000 --- a/python-k8sapp-ptp-notification/debian/deb_folder/rules +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/make -f -# export DH_VERBOSE = 1 - -export APP_NAME=ptp-notification -export PBR_VERSION=1.0.0 -export PYBUILD_NAME=k8sapp-ptp-notification -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-ptp-notification/debian/meta_data.yaml b/python-k8sapp-ptp-notification/debian/meta_data.yaml deleted file mode 100644 index 9ad9c3f..0000000 --- a/python-k8sapp-ptp-notification/debian/meta_data.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -debname: python3-k8sapp-ptp-notification -debver: 1.0-1 -src_path: k8sapp_ptp_notification -revision: - dist: $STX_DIST - PKG_GITREVCOUNT: true diff --git a/python-k8sapp-ptp-notification/debian/deb_folder/changelog b/python3-k8sapp-ptp-notification/debian/deb_folder/changelog similarity index 100% rename from python-k8sapp-ptp-notification/debian/deb_folder/changelog rename to python3-k8sapp-ptp-notification/debian/deb_folder/changelog diff --git a/python-k8sapp-ptp-notification/debian/deb_folder/control b/python3-k8sapp-ptp-notification/debian/deb_folder/control similarity index 100% rename from python-k8sapp-ptp-notification/debian/deb_folder/control rename to python3-k8sapp-ptp-notification/debian/deb_folder/control diff --git a/python-k8sapp-ptp-notification/debian/deb_folder/copyright b/python3-k8sapp-ptp-notification/debian/deb_folder/copyright similarity index 100% rename from python-k8sapp-ptp-notification/debian/deb_folder/copyright rename to python3-k8sapp-ptp-notification/debian/deb_folder/copyright diff --git a/python3-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification-wheels.install b/python3-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification-wheels.install new file mode 100644 index 0000000..19a9e4c --- /dev/null +++ b/python3-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification-wheels.install @@ -0,0 +1 @@ +plugins/*.whl diff --git a/python3-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification.install b/python3-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification.install new file mode 100644 index 0000000..91d1d9d --- /dev/null +++ b/python3-k8sapp-ptp-notification/debian/deb_folder/python3-k8sapp-ptp-notification.install @@ -0,0 +1 @@ +usr/lib/python3/dist-packages/k8sapp_* diff --git a/python3-k8sapp-ptp-notification/debian/deb_folder/rules b/python3-k8sapp-ptp-notification/debian/deb_folder/rules new file mode 100755 index 0000000..68f3ad1 --- /dev/null +++ b/python3-k8sapp-ptp-notification/debian/deb_folder/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f +# export DH_VERBOSE = 1 + +export APP_NAME = ptp-notification +export PYBUILD_NAME = k8sapp-ptp-notification + +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-ptp-notification/debian/deb_folder/source/format b/python3-k8sapp-ptp-notification/debian/deb_folder/source/format similarity index 100% rename from python-k8sapp-ptp-notification/debian/deb_folder/source/format rename to python3-k8sapp-ptp-notification/debian/deb_folder/source/format diff --git a/python3-k8sapp-ptp-notification/debian/meta_data.yaml b/python3-k8sapp-ptp-notification/debian/meta_data.yaml new file mode 100644 index 0000000..455a7fd --- /dev/null +++ b/python3-k8sapp-ptp-notification/debian/meta_data.yaml @@ -0,0 +1,9 @@ +--- +debname: python3-k8sapp-ptp-notification +debver: 1.0-1 +src_path: k8sapp_ptp_notification +revision: + dist: $STX_DIST + GITREVCOUNT: + SRC_DIR: ${MY_REPO}/stx/ptp-notification-armada-app + BASE_SRCREV: 0d723d79e5075ff6d7630240303c994278814064 diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/.gitignore b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/.gitignore similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/.gitignore rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/.gitignore diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/.stestr.conf b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/.stestr.conf similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/.stestr.conf rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/.stestr.conf diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/LICENSE b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/LICENSE similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/LICENSE rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/LICENSE diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/README.rst b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/README.rst similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/README.rst rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/README.rst diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/__init__.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/__init__.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/__init__.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/__init__.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/__init__.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/__init__.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/__init__.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/__init__.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/manifest_ptp_notification.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/manifest_ptp_notification.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/manifest_ptp_notification.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/armada/manifest_ptp_notification.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/common/__init__.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/common/__init__.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/common/__init__.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/common/__init__.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/common/constants.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/common/constants.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/common/constants.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/common/constants.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/__init__.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/__init__.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/__init__.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/__init__.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/psp_rolebinding.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/psp_rolebinding.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/psp_rolebinding.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/psp_rolebinding.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/ptp_notification.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/ptp_notification.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/ptp_notification.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/helm/ptp_notification.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/__init__.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/__init__.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/__init__.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/__init__.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_plugins.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_plugins.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_plugins.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_plugins.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_ptp.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_ptp.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_ptp.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/k8sapp_ptp_notification/tests/test_ptp.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/pylint.rc b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/pylint.rc similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/pylint.rc rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/pylint.rc diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/requirements.txt b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/requirements.txt similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/requirements.txt rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/requirements.txt diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.cfg b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.cfg similarity index 98% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.cfg rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.cfg index bf53c1c..aa94565 100644 --- a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.cfg +++ b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.cfg @@ -35,5 +35,6 @@ systemconfig.helm_applications = systemconfig.helm_plugins.ptp_notification = 001_ptp_notification = k8sapp_ptp_notification.helm.ptp_notification:PTPNotificationHelm 002_ptp_notification-psp-rolebinding = k8sapp_ptp_notification.helm.psp_rolebinding:PSPRolebindingHelm -[wheel] + +[bdist_wheel] universal = 1 diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.py b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.py similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.py rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/setup.py diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/test-requirements.txt b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/test-requirements.txt similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/test-requirements.txt rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/test-requirements.txt diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/tox.ini diff --git a/python-k8sapp-ptp-notification/k8sapp_ptp_notification/upper-constraints.txt b/python3-k8sapp-ptp-notification/k8sapp_ptp_notification/upper-constraints.txt similarity index 100% rename from python-k8sapp-ptp-notification/k8sapp_ptp_notification/upper-constraints.txt rename to python3-k8sapp-ptp-notification/k8sapp_ptp_notification/upper-constraints.txt diff --git a/stx-ptp-notification-helm/centos/build_srpm.data b/stx-ptp-notification-helm/centos/build_srpm.data deleted file mode 100644 index e3aa90f..0000000 --- a/stx-ptp-notification-helm/centos/build_srpm.data +++ /dev/null @@ -1,11 +0,0 @@ -SRC_DIR="stx-ptp-notification-helm" - -OPT_DEP_LIST="$STX_BASE/ptp-notification-armada-app/python-k8sapp-ptp-notification" - -COPY_LIST_TO_TAR="\ - $STX_BASE/helm-charts/psp-rolebinding/psp-rolebinding/helm-charts \ -" -# Keep the SRCREV in sync with python-k8sapp-ptp-notification so the app version is -# the same as the plugin version -TIS_BASE_SRCREV=c525a7fe479103bc316792c11b5289ebcca8a2a7 -TIS_PATCH_VER=GITREVCOUNT \ No newline at end of file diff --git a/stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec b/stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec deleted file mode 100644 index e752f67..0000000 --- a/stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec +++ /dev/null @@ -1,93 +0,0 @@ -# -# Copyright (c) 2021-2022 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -# Application tunables (maps to metadata) -%global app_name ptp-notification -%global helm_repo stx-platform - -# Install location -%global app_folder /usr/local/share/applications/helm - -# Build variables -%global helm_folder /usr/lib/helm - -Summary: StarlingX PTP Notification FluxCD Helm Charts -Name: stx-ptp-notification-helm -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -URL: unknown - -Source0: %{name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: helm -BuildRequires: chartmuseum -BuildRequires: python-k8sapp-ptp-notification -BuildRequires: python-k8sapp-ptp-notification-wheels - -%description -StarlingX PTP Notification FluxCD Helm Charts - -%prep -%setup -n %{name}-%{version} - -%build -chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." & -sleep 2 - -helm repo add local http://localhost:8879/charts - -cd helm-charts -make ptp-notification -make psp-rolebinding -cd - - -# Terminate helm server (the last backgrounded task) -kill %1 - -# 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 -%define fluxcd_app_path %{_builddir}/%{app_tarball_fluxcd} - -# 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 - -# package fluxcd -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 -tar -zcf %fluxcd_app_path -C %{app_staging}/ . - -cd - - -# Cleanup staging -rm -fr %{app_staging} - -%install -install -d -m 755 %{buildroot}/%{app_folder} -install -p -D -m 755 %fluxcd_app_path %{buildroot}/%{app_folder} - -%files -%defattr(-,root,root,-) -%{app_folder}/%{app_tarball_fluxcd} diff --git a/stx-ptp-notification-helm/debian/deb_folder/rules b/stx-ptp-notification-helm/debian/deb_folder/rules index f426fe4..553b23b 100755 --- a/stx-ptp-notification-helm/debian/deb_folder/rules +++ b/stx-ptp-notification-helm/debian/deb_folder/rules @@ -45,7 +45,7 @@ override_dh_auto_build: # Copy the plugins: installed in the buildroot mkdir -p $(STAGING)/plugins - cp /plugins/$(APP_NAME)/*.whl $(STAGING)/plugins + cp /plugins/*.whl $(STAGING)/plugins # Prepare staging for fluxcd package cp -R fluxcd-manifests $(STAGING)/ diff --git a/stx-ptp-notification-helm/debian/meta_data.yaml b/stx-ptp-notification-helm/debian/meta_data.yaml index cef3ac9..4c76de9 100644 --- a/stx-ptp-notification-helm/debian/meta_data.yaml +++ b/stx-ptp-notification-helm/debian/meta_data.yaml @@ -6,4 +6,6 @@ src_files: - ${MY_REPO}/stx/helm-charts/psp-rolebinding/psp-rolebinding revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + SRC_DIR: ${MY_REPO}/stx/ptp-notification-armada-app + BASE_SRCREV: 0d723d79e5075ff6d7630240303c994278814064