Revert "Standardize app configs"
This reverts commit 142f990d72.
Reason for revert: Keeping CentOS builds sane on the stx main branch until it is entirely disabled
This revert needed to upversion pylint from py27 to py39
Change-Id: Icdfd418d361b7f5687a30ed2401b9288833c554d
This commit is contained in:
Thales Elero Cervi
Al Bailey
parent
aa439cc608
commit
fc65da101c
19
.zuul.yaml
19
.zuul.yaml
@ -13,6 +13,7 @@
|
||||
- k8sapp-openstack-tox-py36
|
||||
- k8sapp-openstack-tox-py39
|
||||
- k8sapp-openstack-tox-pylint
|
||||
- k8sapp-openstack-tox-pep8
|
||||
post:
|
||||
jobs:
|
||||
- stx-openstack-armada-app-upload-git-mirror
|
||||
@ -29,11 +30,11 @@
|
||||
- starlingx/update
|
||||
- starlingx/utilities
|
||||
files:
|
||||
- python3-k8sapp-openstack/k8sapp_openstack/*
|
||||
- python-k8sapp-openstack/k8sapp_openstack/*
|
||||
vars:
|
||||
tox_envlist: py36
|
||||
python_version: 3.6
|
||||
tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
|
||||
tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
|
||||
- job:
|
||||
name: k8sapp-openstack-tox-py39
|
||||
parent: tox-py39
|
||||
@ -46,11 +47,11 @@
|
||||
- starlingx/update
|
||||
- starlingx/utilities
|
||||
files:
|
||||
- python3-k8sapp-openstack/k8sapp_openstack/*
|
||||
- python-k8sapp-openstack/k8sapp_openstack/*
|
||||
vars:
|
||||
tox_envlist: py39
|
||||
python_version: 3.9
|
||||
tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
|
||||
tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
|
||||
- job:
|
||||
name: stx-openstack-armada-app-upload-git-mirror
|
||||
parent: upload-git-mirror
|
||||
@ -68,17 +69,17 @@
|
||||
parent: tox
|
||||
description: |
|
||||
Run pylint tests for k8sapp_oidc
|
||||
nodeset: ubuntu-bionic
|
||||
nodeset: debian-bullseye
|
||||
required-projects:
|
||||
- starlingx/config
|
||||
- starlingx/fault
|
||||
- starlingx/update
|
||||
- starlingx/utilities
|
||||
files:
|
||||
- python3-k8sapp-openstack/*
|
||||
- python-k8sapp-openstack/*
|
||||
vars:
|
||||
tox_envlist: pylint
|
||||
tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
|
||||
tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
|
||||
|
||||
- job:
|
||||
name: k8sapp-openstack-tox-pep8
|
||||
@ -92,10 +93,10 @@
|
||||
- starlingx/update
|
||||
- starlingx/utilities
|
||||
files:
|
||||
- python3-k8sapp-openstack/*
|
||||
- python-k8sapp-openstack/*
|
||||
vars:
|
||||
tox_envlist: pep8
|
||||
tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
|
||||
tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
|
||||
|
||||
- secret:
|
||||
name: stx-openstack-armada-app-github-secret
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
openstack-helm
|
||||
openstack-helm-infra
|
||||
python3-k8sapp-openstack
|
||||
python-k8sapp-openstack
|
||||
stx-openstack-helm
|
||||
stx-openstack-helm-fluxcd
|
||||
|
||||
@ -0,0 +1,2 @@
|
||||
usr/lib/python3/dist-packages/k8sapp_openstack-1.0.0.egg-info/*
|
||||
usr/lib/python3/dist-packages/k8sapp_openstack/*
|
||||
26
python-k8sapp-openstack/debian/deb_folder/rules
Executable file
26
python-k8sapp-openstack/debian/deb_folder/rules
Executable file
@ -0,0 +1,26 @@
|
||||
#!/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
|
||||
7
python-k8sapp-openstack/debian/meta_data.yaml
Normal file
7
python-k8sapp-openstack/debian/meta_data.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
---
|
||||
debname: python3-k8sapp-openstack
|
||||
debver: 1.0-1
|
||||
src_path: k8sapp_openstack
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
@ -171,11 +171,13 @@ enable=E1603,E1609,E1610,E1602,E1606,E1608,E1607,E1605,E1604,E1601,E1611,W1652,
|
||||
# E1121: too-many-function-args
|
||||
# Disable Python3 checkers:
|
||||
# W1618: no-absolute-import
|
||||
# Adding some other checkers temporarily W0707, W1406, W1514
|
||||
disable=C, R, fixme, W0101, W0105, W0106, W0107, W0108, W0110, W0123, W0150,
|
||||
W0201, W0211, W0212, W0221, W0223, W0231, W0235, W0311, W0402, W0403,
|
||||
W0404, W0603, W0612, W0613, W0621, W0622, W0631, W0632, W0701, W0703,
|
||||
W1113, W1201, W1401, W1505, W1618,
|
||||
E0213, E0401, E0604, E0633, E0701, E1102, E1120, E1121
|
||||
E0213, E0401, E0604, E0633, E0701, E1102, E1120, E1121,
|
||||
W0707, W1406, W1514
|
||||
|
||||
[REPORTS]
|
||||
# Set the output format. Available formats are text, parseable, colorized, msvs
|
||||
@ -72,5 +72,5 @@ systemconfig.armada.manifest_ops =
|
||||
systemconfig.app_lifecycle =
|
||||
openstack = k8sapp_openstack.lifecycle.lifecycle_openstack:OpenstackAppLifecycleOperator
|
||||
|
||||
[bdist_wheel]
|
||||
[wheel]
|
||||
universal = 1
|
||||
@ -183,15 +183,9 @@ deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = bandit --ini tox.ini -n 5 -r k8sapp_openstack
|
||||
|
||||
[testenv:pylint]
|
||||
basepython = python2.7
|
||||
sitepackages = False
|
||||
deps = {[testenv]deps}
|
||||
pylint
|
||||
install_command = pip install \
|
||||
-v -v -v \
|
||||
-c{toxinidir}/upper-constraints.txt \
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
|
||||
{opts} {packages}
|
||||
pylint<2.16
|
||||
commands =
|
||||
pylint {posargs} k8sapp_openstack --rcfile=./pylint.rc
|
||||
|
||||
@ -1 +0,0 @@
|
||||
usr/lib/python3/dist-packages/k8sapp_*
|
||||
@ -1,33 +0,0 @@
|
||||
#!/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
|
||||
@ -1,9 +0,0 @@
|
||||
---
|
||||
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
|
||||
@ -7,6 +7,4 @@ src_files:
|
||||
- ${MY_REPO}/stx/helm-charts/fm-rest-api/fm-rest-api/helm-charts
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
SRC_DIR: ${MY_REPO}/stx/openstack-armada-app
|
||||
BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827
|
||||
PKG_GITREVCOUNT: true
|
||||
|
||||
@ -7,6 +7,4 @@ src_files:
|
||||
- ${MY_REPO}/stx/helm-charts/fm-rest-api/fm-rest-api/helm-charts
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
SRC_DIR: ${MY_REPO}/stx/openstack-armada-app
|
||||
BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827
|
||||
PKG_GITREVCOUNT: true
|
||||
|
||||
Loading…
Reference in New Issue
Block a user