diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install b/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install index 31ca589..80a08fd 100644 --- a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install +++ b/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install @@ -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/* diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules b/python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules index 6d3fe64..606b358 100755 --- a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules +++ b/python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules @@ -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 diff --git a/stx-nginx-ingress-controller-helm/debian/deb_folder/rules b/stx-nginx-ingress-controller-helm/debian/deb_folder/rules index cc81590..21ecc56 100755 --- a/stx-nginx-ingress-controller-helm/debian/deb_folder/rules +++ b/stx-nginx-ingress-controller-helm/debian/deb_folder/rules @@ -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.