From 1904a035b00dfc07b267012efc494a10b552210c Mon Sep 17 00:00:00 2001 From: Hemanth Nakkina Date: Wed, 12 Jun 2024 13:37:06 +0530 Subject: [PATCH] Remove unnecessary files in cookiecutter code Remove tox files, scripts, tests.yaml from cookiecutter code as they are moved out of charm code. Change-Id: Ic9cb970914aba3556bab3bab17b48761292063b4 --- .../fetch-libs.sh | 7 - .../{{cookiecutter.service_name}}/osci.yaml | 10 -- .../pyproject.toml | 39 ----- .../{{cookiecutter.service_name}}/rename.sh | 13 -- .../tests/tests.yaml | 18 -- .../{{cookiecutter.service_name}}/tox.ini | 161 ------------------ 6 files changed, 248 deletions(-) delete mode 100755 ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/fetch-libs.sh delete mode 100644 ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/osci.yaml delete mode 100644 ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/pyproject.toml delete mode 100755 ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/rename.sh delete mode 100644 ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/tests/tests.yaml delete mode 100644 ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/tox.ini diff --git a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/fetch-libs.sh b/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/fetch-libs.sh deleted file mode 100755 index 178e6f07..00000000 --- a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/fetch-libs.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -echo "INFO: Fetching libs from charmhub." -# charmcraft fetch-lib charms.data_platform_libs.v0.data_interfaces -# charmcraft fetch-lib charms.keystone_k8s.v1.identity_service -# charmcraft fetch-lib charms.rabbitmq_k8s.v0.rabbitmq -# charmcraft fetch-lib charms.traefik_k8s.v1.ingress diff --git a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/osci.yaml b/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/osci.yaml deleted file mode 100644 index ff482b08..00000000 --- a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/osci.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- project: - templates: - - charm-publish-jobs - vars: - needs_charm_build: true - charm_build_name: {{ cookiecutter.service_name }}-k8s - build_type: charmcraft - publish_charm: true - charmcraft_channel: 2.0/stable - publish_channel: 2023.1/edge diff --git a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/pyproject.toml b/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/pyproject.toml deleted file mode 100644 index 30821404..00000000 --- a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/pyproject.toml +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2023 Canonical Ltd. -# See LICENSE file for licensing details. - -# Testing tools configuration -[tool.coverage.run] -branch = true - -[tool.coverage.report] -show_missing = true - -[tool.pytest.ini_options] -minversion = "6.0" -log_cli_level = "INFO" - -# Formatting tools configuration -[tool.black] -line-length = 79 - -[tool.isort] -profile = "black" -multi_line_output = 3 -force_grid_wrap = true - -# Linting tools configuration -[tool.flake8] -max-line-length = 79 -max-doc-length = 99 -max-complexity = 10 -exclude = [".git", "__pycache__", ".tox", "build", "dist", "*.egg_info", "venv"] -select = ["E", "W", "F", "C", "N", "R", "D", "H"] -# Ignore W503, E501 because using black creates errors with this -# Ignore D107 Missing docstring in __init__ -ignore = ["W503", "E501", "D107", "E402"] -per-file-ignores = [] -docstring-convention = "google" -# Check for properly formatted copyright header in each file -copyright-check = "True" -copyright-author = "Canonical Ltd." -copyright-regexp = "Copyright\\s\\d{4}([-,]\\d{4})*\\s+%(author)s" diff --git a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/rename.sh b/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/rename.sh deleted file mode 100755 index d0c35c97..00000000 --- a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/rename.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}') -echo "renaming ${charm}_*.charm to ${charm}.charm" -echo -n "pwd: " -pwd -ls -al -echo "Removing bad downloaded charm maybe?" -if [[ -e "${charm}.charm" ]]; -then - rm "${charm}.charm" -fi -echo "Renaming charm here." -mv ${charm}_*.charm ${charm}.charm diff --git a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/tests/tests.yaml b/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/tests/tests.yaml deleted file mode 100644 index 34e47f18..00000000 --- a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/tests/tests.yaml +++ /dev/null @@ -1,18 +0,0 @@ -gate_bundles: - - smoke -smoke_bundles: - - smoke -configure: - - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles -tests: [] -tests_options: - trust: - - smoke - ignore_hard_deploy_errors: - - smoke - - tempest: - default: - smoke: True - -target_deploy_status: [] diff --git a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/tox.ini b/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/tox.ini deleted file mode 100644 index 0bc536c1..00000000 --- a/ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/tox.ini +++ /dev/null @@ -1,161 +0,0 @@ -# Operator charm (with zaza): tox.ini - -[tox] -skipsdist = True -envlist = pep8,py3 -sitepackages = False -skip_missing_interpreters = False -minversion = 3.18.0 - -[vars] -src_path = {toxinidir}/src/ -tst_path = {toxinidir}/tests/ -lib_path = {toxinidir}/lib/ -pyproject_toml = {toxinidir}/pyproject.toml -all_path = {[vars]src_path} {[vars]tst_path} - -[testenv] -basepython = python3 -setenv = - PYTHONPATH = {toxinidir}:{[vars]lib_path}:{[vars]src_path} -passenv = - HOME - PYTHONPATH -install_command = - pip install {opts} {packages} -commands = stestr run --slowest {posargs} -allowlist_externals = - git - charmcraft - {toxinidir}/fetch-libs.sh - {toxinidir}/rename.sh -deps = - -r{toxinidir}/test-requirements.txt - -[testenv:fmt] -description = Apply coding style standards to code -deps = - black - isort -commands = - isort {[vars]all_path} --skip-glob {[vars]lib_path} --skip {toxinidir}/.tox - black --config {[vars]pyproject_toml} {[vars]all_path} --exclude {[vars]lib_path} - -[testenv:build] -basepython = python3 -deps = -commands = - charmcraft -v pack - {toxinidir}/rename.sh - -[testenv:fetch] -basepython = python3 -deps = -commands = - {toxinidir}/fetch-libs.sh - -[testenv:py3] -basepython = python3 -deps = - {[testenv]deps} - -r{toxinidir}/requirements.txt - -[testenv:py38] -basepython = python3.8 -deps = {[testenv:py3]deps} - -[testenv:py39] -basepython = python3.9 -deps = {[testenv:py3]deps} - -[testenv:py310] -basepython = python3.10 -deps = {[testenv:py3]deps} - -[testenv:cover] -basepython = python3 -deps = {[testenv:py3]deps} -setenv = - {[testenv]setenv} - PYTHON=coverage run -commands = - coverage erase - stestr run --slowest {posargs} - coverage combine - coverage html -d cover - coverage xml -o cover/coverage.xml - coverage report - -[testenv:pep8] -description = Alias for lint -deps = {[testenv:lint]deps} -commands = {[testenv:lint]commands} - -[testenv:lint] -description = Check code against coding style standards -deps = - black - flake8<6 # Pin version until https://github.com/savoirfairelinux/flake8-copyright/issues/19 is merged - flake8-docstrings - flake8-copyright - flake8-builtins - pyproject-flake8 - pep8-naming - isort - codespell -commands = - codespell {[vars]all_path} - # pflake8 wrapper supports config from pyproject.toml - pflake8 --exclude {[vars]lib_path} --config {toxinidir}/pyproject.toml {[vars]all_path} - isort --check-only --diff {[vars]all_path} --skip-glob {[vars]lib_path} - black --config {[vars]pyproject_toml} --check --diff {[vars]all_path} --exclude {[vars]lib_path} - -[testenv:func-noop] -basepython = python3 -deps = - git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza - git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack - git+https://opendev.org/openstack/tempest.git#egg=tempest -commands = - functest-run-suite --help - -[testenv:func] -basepython = python3 -deps = {[testenv:func-noop]deps} -commands = - functest-run-suite --keep-model - -[testenv:func-smoke] -basepython = python3 -deps = {[testenv:func-noop]deps} -setenv = - TEST_MODEL_SETTINGS = automatically-retry-hooks=true - TEST_MAX_RESOLVE_COUNT = 5 -commands = - functest-run-suite --keep-model --smoke - -[testenv:func-dev] -basepython = python3 -deps = {[testenv:func-noop]deps} -commands = - functest-run-suite --keep-model --dev - -[testenv:func-target] -basepython = python3 -deps = {[testenv:func-noop]deps} -commands = - functest-run-suite --keep-model --bundle {posargs} - -[coverage:run] -branch = True -concurrency = multiprocessing -parallel = True -source = - . -omit = - .tox/* - tests/* - src/templates/* - -[flake8] -ignore=E226,W504