Update app Zuul Check Jobs.

Modify code to conform to flake8 and pylint.

Jobs are now flake8, pylint, py39 and metadata.

Test Plan
PASS - All zuul jobs pass as expected.

Story: 2010929
Task: 49257

Change-Id: I7bcbed1631934d24d6452a120a2e9d915c26aa0e
Signed-off-by: Reed, Joshua <Joshua.Reed@windriver.com>
This commit is contained in:
Reed, Joshua 2023-12-13 14:39:42 -07:00
parent bef6099b01
commit da7880da3e
6 changed files with 64 additions and 8 deletions

3
.gitignore vendored
View File

@ -36,4 +36,5 @@ ChangeLog
**bin
**go-compose
*.log
coverage.*
coverage.*
venv/

View File

@ -5,12 +5,16 @@
- openstack-tox-linters
- k8sapp-node-interface-metrics-exporter-tox-py39
- k8sapp-node-interface-metrics-exporter-tox-pylint
- k8sapp-node-interface-metrics-exporter-tox-flake8
- k8sapp-node-interface-metrics-exporter-tox-metadata
- go-lint
gate:
jobs:
- openstack-tox-linters
- k8sapp-node-interface-metrics-exporter-tox-py39
- k8sapp-node-interface-metrics-exporter-tox-pylint
- k8sapp-node-interface-metrics-exporter-tox-flake8
- k8sapp-node-interface-metrics-exporter-tox-metadata
- job:
name: k8sapp-node-interface-metrics-exporter-tox-py39
@ -30,6 +34,25 @@
tox_extra_args: -c python3-k8sapp-node-interface-metrics-exporter/k8sapp_node_interface_metrics_exporter/tox.ini
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/starlingx/root/build-tools/requirements/debian/upper-constraints.txt'
- job:
name: k8sapp-node-interface-metrics-exporter-tox-metadata
parent: tox
description: |
Run metadata test for k8sapp_node_interface_metrics_exporter
nodeset: debian-bullseye
required-projects:
- starlingx/config
- starlingx/fault
- starlingx/update
- starlingx/utilities
- starlingx/root
files:
- python3-k8sapp-node-interface-metrics-exporter/*
vars:
tox_envlist: metadata
tox_extra_args: -c python3-k8sapp-node-interface-metrics-exporter/k8sapp_node_interface_metrics_exporter/tox.ini
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/starlingx/root/build-tools/requirements/debian/upper-constraints.txt'
- job:
name: k8sapp-node-interface-metrics-exporter-tox-pylint
parent: tox
@ -49,6 +72,25 @@
tox_extra_args: -c python3-k8sapp-node-interface-metrics-exporter/k8sapp_node_interface_metrics_exporter/tox.ini
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/starlingx/root/build-tools/requirements/debian/upper-constraints.txt'
- job:
name: k8sapp-node-interface-metrics-exporter-tox-flake8
parent: tox
description: |
Run flake8 test for k8sapp_node_interface_metrics_exporter
nodeset: debian-bullseye
required-projects:
- starlingx/config
- starlingx/fault
- starlingx/update
- starlingx/utilities
- starlingx/root
files:
- python3-k8sapp-node-interface-metrics-exporter/*
vars:
tox_envlist: flake8
tox_extra_args: -c python3-k8sapp-node-interface-metrics-exporter/k8sapp_node_interface_metrics_exporter/tox.ini
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/starlingx/root/build-tools/requirements/debian/upper-constraints.txt'
- job:
name: go-lint
parent: golangci-lint

View File

@ -1,5 +1,5 @@
[tox]
envlist = flake8,py39,pylint
envlist = flake8,py39,pylint,metadata
minversion = 1.6
skipsdist = True
@ -16,6 +16,7 @@ usedevelop = True
# tox is silly... these need to be separated by a newline....
allowlist_externals = bash
find
echo
install_command = pip install -v -v -v \
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
@ -177,3 +178,11 @@ commands =
deps = pip_missing_reqs
-rrequirements.txt
commands=pip-missing-reqs -d --ignore-file=/k8sapp_node_interface_metrics_exporter/tests k8sapp_node_interface_metrics_exporter
[testenv:metadata]
install_command = pip install -v -v -v \
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
{opts} {packages}
# Pass top level app folder to 'sysinv-app tox' command.
commands =
bash -c "echo $(dirname $(dirname $(pwd))) | xargs -n 1 sysinv-app tox"

View File

@ -30,9 +30,9 @@ override_dh_auto_build:
cp helm-charts/*.tgz $(STAGING)/charts
# Populate metadata.
sed -i 's/@APP_NAME@/$(APP_NAME)/g' $(STAGING)/metadata.yaml
sed -i 's/@APP_VERSION@/$(APP_VERSION)/g' $(STAGING)/metadata.yaml
sed -i 's/@HELM_REPO@/$(HELM_REPO)/g' $(STAGING)/metadata.yaml
sed -i 's/APP_REPLACE_NAME/$(APP_NAME)/g' $(STAGING)/metadata.yaml
sed -i 's/APP_REPLACE_VERSION/$(APP_VERSION)/g' $(STAGING)/metadata.yaml
sed -i 's/HELM_REPLACE_REPO/$(HELM_REPO)/g' $(STAGING)/metadata.yaml
# Copy the plugins: installed in the buildroot
mkdir -p $(STAGING)/plugins

View File

@ -1,6 +1,6 @@
app_name: @APP_NAME@
app_version: @APP_VERSION@
helm_repo: @HELM_REPO@
app_name: APP_REPLACE_NAME
app_version: APP_REPLACE_VERSION
helm_repo: HELM_REPLACE_REPO
maintain_user_overrides: true
maintain_attributes: true

View File

@ -46,6 +46,10 @@ description = Dummy environment to allow flake8 to be run in subdir tox
basepython = python3
description = Dummy environment to allow pylint to be run in subdir tox
[testenv:metadata]
basepython = python3
description = Dummy environment to allow sysinv-app to be run in subdir tox
[testenv:bandit]
basepython = python3
description = Dummy environment to allow bandit to be run in subdir tox