diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f51ee66 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.tox +venv/ \ No newline at end of file diff --git a/.zuul.yaml b/.zuul.yaml index 9c9b00c..97bd7a9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,6 +9,7 @@ - k8sapp-power-metrics-tox-flake8 - k8sapp-power-metrics-tox-pylint - k8sapp-power-metrics-tox-bandit + - k8sapp-power-metrics-tox-metadata gate: jobs: - openstack-tox-linters @@ -16,6 +17,7 @@ - k8sapp-power-metrics-tox-flake8 - k8sapp-power-metrics-tox-pylint - k8sapp-power-metrics-tox-bandit + - k8sapp-power-metrics-tox-metadata - job: name: k8sapp-power-metrics-tox-py39 @@ -48,6 +50,25 @@ tox_envlist: flake8 tox_extra_args: -c python3-k8sapp-power-metrics/k8sapp_power_metrics/tox.ini +- job: + name: k8sapp-power-metrics-tox-metadata + parent: tox + description: | + Run metadata test for k8sapp_power_metrics + required-projects: + - starlingx/config + - starlingx/fault + - starlingx/root + - starlingx/update + - starlingx/utilities + nodeset: debian-bullseye + files: + - python3-k8sapp-power-metrics/* + vars: + tox_envlist: metadata + tox_extra_args: -c python3-k8sapp-power-metrics/k8sapp_power_metrics/tox.ini + tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/starlingx/root/build-tools/requirements/debian/upper-constraints.txt' + - job: name: k8sapp-power-metrics-tox-pylint parent: tox diff --git a/python3-k8sapp-power-metrics/k8sapp_power_metrics/tox.ini b/python3-k8sapp-power-metrics/k8sapp_power_metrics/tox.ini index e97549b..39f8776 100644 --- a/python3-k8sapp-power-metrics/k8sapp_power_metrics/tox.ini +++ b/python3-k8sapp-power-metrics/k8sapp_power_metrics/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = flake8,py39,pylint,bandit +envlist = flake8,py39,pylint,bandit,metadata minversion = 2.9 skipsdist = True @@ -11,6 +11,8 @@ distshare={toxworkdir}/.tox/distshare [testenv] allowlist_externals = bash find + echo + basepython = python3.9 sitepackages = False @@ -86,3 +88,11 @@ commands = deps = pip_missing_reqs -rrequirements.txt commands=pip-missing-reqs -d --ignore-file=/k8sapp_power_metrics/tests k8sapp_power_metrics + +[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" \ No newline at end of file diff --git a/stx-power-metrics-helm/debian/deb_folder/rules b/stx-power-metrics-helm/debian/deb_folder/rules index eee5022..ae97c07 100644 --- a/stx-power-metrics-helm/debian/deb_folder/rules +++ b/stx-power-metrics-helm/debian/deb_folder/rules @@ -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 diff --git a/stx-power-metrics-helm/stx-power-metrics-helm/files/metadata.yaml b/stx-power-metrics-helm/stx-power-metrics-helm/files/metadata.yaml index 3e5d0cc..63e1254 100644 --- a/stx-power-metrics-helm/stx-power-metrics-helm/files/metadata.yaml +++ b/stx-power-metrics-helm/stx-power-metrics-helm/files/metadata.yaml @@ -1,8 +1,8 @@ maintain_user_overrides: true -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 upgrades: auto_update: true diff --git a/tox.ini b/tox.ini index 31d285b..006ceae 100644 --- a/tox.ini +++ b/tox.ini @@ -47,6 +47,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