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: 49254

Change-Id: I4def40c3f4304196b6a64cf88c8929687bef2fea
Signed-off-by: Reed, Joshua <Joshua.Reed@windriver.com>
This commit is contained in:
Reed, Joshua 2023-12-13 13:40:09 -07:00
parent 5b2dd4c601
commit 6737c49052
6 changed files with 41 additions and 6 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
.tox
venv/

View File

@ -8,12 +8,14 @@
- k8sapp-kubevirt-tox-py39 - k8sapp-kubevirt-tox-py39
- k8sapp-kubevirt-tox-flake8 - k8sapp-kubevirt-tox-flake8
- k8sapp-kubevirt-tox-pylint - k8sapp-kubevirt-tox-pylint
- k8sapp-kubevirt-tox-metadata
gate: gate:
jobs: jobs:
- openstack-tox-linters - openstack-tox-linters
- k8sapp-kubevirt-tox-py39 - k8sapp-kubevirt-tox-py39
- k8sapp-kubevirt-tox-flake8 - k8sapp-kubevirt-tox-flake8
- k8sapp-kubevirt-tox-pylint - k8sapp-kubevirt-tox-pylint
- k8sapp-kubevirt-tox-metadata
- job: - job:
name: k8sapp-kubevirt-tox-py39 name: k8sapp-kubevirt-tox-py39
@ -46,6 +48,25 @@
tox_envlist: flake8 tox_envlist: flake8
tox_extra_args: -c python3-k8sapp-kubevirt/k8sapp_kubevirt/tox.ini tox_extra_args: -c python3-k8sapp-kubevirt/k8sapp_kubevirt/tox.ini
- job:
name: k8sapp-kubevirt-tox-metadata
parent: tox
description: |
Run metadata test for k8sapp_kubevirt
required-projects:
- starlingx/config
- starlingx/fault
- starlingx/root
- starlingx/update
- starlingx/utilities
nodeset: debian-bullseye
files:
- python3-k8sapp-kubevirt/*
vars:
tox_envlist: metadata
tox_extra_args: -c python3-k8sapp-kubevirt/k8sapp_kubevirt/tox.ini
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/starlingx/root/build-tools/requirements/debian/upper-constraints.txt'
- job: - job:
name: k8sapp-kubevirt-tox-pylint name: k8sapp-kubevirt-tox-pylint
parent: tox parent: tox

View File

@ -139,3 +139,11 @@ commands =
deps = pip_missing_reqs deps = pip_missing_reqs
-rrequirements.txt -rrequirements.txt
commands=pip-missing-reqs -d k8sapp_kubevirt commands=pip-missing-reqs -d k8sapp_kubevirt
[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

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

View File

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

View File

@ -51,6 +51,10 @@ description = Dummy environment to allow pylint to be run in subdir tox
basepython = python3 basepython = python3
description = Dummy environment to allow pylint to be run in subdir tox 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] [testenv:bandit]
basepython = python3 basepython = python3
description = Dummy environment to allow bandit to be run in subdir tox description = Dummy environment to allow bandit to be run in subdir tox