starlingx/nginx-ingress-controller-armada-app
Code Issues Proposed changes

Debian packaging: Fix manual pycache handling

Browse Source 
Fix python-k8sapp-nginx-ingress-controller install file and
clean up manual pycache removal in rules file.

Story: 2009101
Task: 43746

Signed-off-by: Tracey Bogue <tracey.bogue@windriver.com>
Change-Id: I936d3a8fe2f39dac5d87c84a5cc960ff3aed8d10
This commit is contained in:
Tracey Bogue 2021-12-02 13:32:32 -06:00
parent d2612ce59a
commit 3e716e9c61
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install
View File

@ -1,5 +1,2 @@
usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller-1.0.0.egg-info/*
usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/*.py
usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/common/*.py
usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/lifecycle/*.py
usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/tests/*.py
usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/*

11
python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules
View File

@ -11,13 +11,6 @@ export ROOT=debian/tmp
override_dh_auto_install:
python3 setup.py install --install-layout=deb --root $(ROOT)
rm -rf $(ROOT)/usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/__pycache__
rm -rf $(ROOT)/usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/common/__pycache__
rm -rf $(ROOT)/usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/common/__pycache__
rm -rf $(ROOT)/usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/lifecycle/__pycache__
rm -rf $(ROOT)/usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/lifecycle/__pycache__
rm -rf $(ROOT)/usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/tests/__pycache__
rm -rf $(ROOT)/usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/tests/__pycache__
python3 setup.py bdist_wheel \
--universal \
-d $(ROOT)/plugins/$(APP_NAME)
@ -27,6 +20,6 @@ override_dh_python3:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
# (tbogue) FIXME
PYTHONDIR=$(CURDIR) stestr run || true
# (tbogue) FIXME
PYTHONDIR=$(CURDIR) stestr run || true
endif

3
stx-nginx-ingress-controller-helm/debian/deb_folder/rules
View File

@ -25,7 +25,8 @@ override_dh_auto_build:
# Apply the daemonset tolerations patch.
patch --no-backup-if-mismatch --fuzz=0 -p1 < 0001-add-toleration.patch
# Host a server for the helm charts.
chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &
chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" \
--storage-local-rootdir="." &
sleep 2
helm repo add local http://localhost:8879/charts
# Create the TGZ file.