Remove tempo-vulture example and keep only adminer.
The adminer example is an APACHE-2.0 license which mathes this repo and the tempo-vulture one does not. Therefore, upating this repo to keep similar licenses. Test Plan: PASS - Make sure pytests keep working after update. PASS - Make sure all examples continue to work after changing them. Story: 2010937 Task: 49379 Change-Id: Iba24c9e356886dc8c300c092fb42590f53ae4bc7 Signed-off-by: Reed, Joshua <Joshua.Reed@windriver.com>
This commit is contained in:
parent
9db1a03c7f
commit
b57e56f487
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,6 +3,7 @@ venv/
|
|||||||
env/
|
env/
|
||||||
example/output
|
example/output
|
||||||
example/adminer
|
example/adminer
|
||||||
|
output/
|
||||||
|
|
||||||
# Package / cache items
|
# Package / cache items
|
||||||
.eggs
|
.eggs
|
||||||
|
61
README.md
61
README.md
@ -89,7 +89,7 @@ pip install git+https://opendev.org/starlingx/app-gen-tool.git#subdirectory=./st
|
|||||||
|
|
||||||
This is what you'll find in the `app-gen-tool` repository:
|
This is what you'll find in the `app-gen-tool` repository:
|
||||||
|
|
||||||
```shell
|
```shell.
|
||||||
.
|
.
|
||||||
├── LICENSE
|
├── LICENSE
|
||||||
├── README.md
|
├── README.md
|
||||||
@ -100,13 +100,51 @@ This is what you'll find in the `app-gen-tool` repository:
|
|||||||
├── debian_pkg_dirs
|
├── debian_pkg_dirs
|
||||||
├── debian_stable_wheels.inc
|
├── debian_stable_wheels.inc
|
||||||
├── example
|
├── example
|
||||||
│ ├── adminer-0.2.1.tgz
|
│ ├── app-test-example.yaml
|
||||||
│ └── app-test-adminer-1.yaml
|
│ ├── helm-adminer
|
||||||
|
│ │ └── adminer-0.2.1.tgz
|
||||||
|
│ └── poc-starlingx-messages
|
||||||
|
│ ├── Chart.yaml
|
||||||
|
│ ├── templates
|
||||||
|
│ │ ├── deployment.yaml
|
||||||
|
│ │ └── service.yaml
|
||||||
|
│ └── values.yaml
|
||||||
|
├── output
|
||||||
|
│ └── app-test
|
||||||
|
│ ├── charts
|
||||||
|
│ ├── fluxcd-manifests
|
||||||
|
│ │ ├── adminer
|
||||||
|
│ │ │ ├── adminer-static-overrides.yaml
|
||||||
|
│ │ │ ├── adminer-system-overrides.yaml
|
||||||
|
│ │ │ ├── helmrelease.yaml
|
||||||
|
│ │ │ └── kustomization.yaml
|
||||||
|
│ │ ├── base
|
||||||
|
│ │ │ ├── helmrepository.yaml
|
||||||
|
│ │ │ ├── kustomization.yaml
|
||||||
|
│ │ │ └── namespace.yaml
|
||||||
|
│ │ └── kustomization.yaml
|
||||||
|
│ ├── metadata.yaml
|
||||||
|
│ └── plugins
|
||||||
|
│ ├── __init__.py
|
||||||
|
│ ├── k8sapp_app_test
|
||||||
|
│ │ ├── __init__.py
|
||||||
|
│ │ ├── common
|
||||||
|
│ │ │ ├── __init__.py
|
||||||
|
│ │ │ └── constants.py
|
||||||
|
│ │ ├── helm
|
||||||
|
│ │ │ ├── __init__.py
|
||||||
|
│ │ │ └── adminer.py
|
||||||
|
│ │ ├── kustomize
|
||||||
|
│ │ │ ├── __init__.py
|
||||||
|
│ │ │ └── kustomize_app_test.py
|
||||||
|
│ │ └── lifecycle
|
||||||
|
│ │ ├── __init__.py
|
||||||
|
│ │ └── lifecycle_app_test.py
|
||||||
|
│ ├── setup.cfg
|
||||||
|
│ └── setup.py
|
||||||
├── playbooks
|
├── playbooks
|
||||||
│ └── app-gen-tool-tox-coverage
|
│ └── app-gen-tool-tox-coverage
|
||||||
│ └── pre.yaml
|
│ └── pre.yaml
|
||||||
├── scripts
|
|
||||||
│ └── fetch_chart_info.sh
|
|
||||||
├── stx-app-generator
|
├── stx-app-generator
|
||||||
│ ├── debian
|
│ ├── debian
|
||||||
│ │ ├── deb_folder
|
│ │ ├── deb_folder
|
||||||
@ -132,7 +170,7 @@ This is what you'll find in the `app-gen-tool` repository:
|
|||||||
│ │ ├── constants.py
|
│ │ ├── constants.py
|
||||||
│ │ ├── fluxcd.py
|
│ │ ├── fluxcd.py
|
||||||
│ │ ├── generator.py
|
│ │ ├── generator.py
|
||||||
│ │ ├── templates_flux
|
│ │ ├── templates_fluxcd
|
||||||
│ │ │ ├── base
|
│ │ │ ├── base
|
||||||
│ │ │ │ ├── helmrepository.template
|
│ │ │ │ ├── helmrepository.template
|
||||||
│ │ │ │ ├── kustomization.template
|
│ │ │ │ ├── kustomization.template
|
||||||
@ -149,15 +187,6 @@ This is what you'll find in the `app-gen-tool` repository:
|
|||||||
│ ├── requirements.txt
|
│ ├── requirements.txt
|
||||||
│ ├── setup.cfg
|
│ ├── setup.cfg
|
||||||
│ ├── setup.py
|
│ ├── setup.py
|
||||||
│ ├── stx_app_generator.egg-info
|
|
||||||
│ │ ├── PKG-INFO
|
|
||||||
│ │ ├── SOURCES.txt
|
|
||||||
│ │ ├── dependency_links.txt
|
|
||||||
│ │ ├── entry_points.txt
|
|
||||||
│ │ ├── not-zip-safe
|
|
||||||
│ │ ├── pbr.json
|
|
||||||
│ │ ├── requires.txt
|
|
||||||
│ │ └── top_level.txt
|
|
||||||
│ └── tests
|
│ └── tests
|
||||||
│ ├── __init__.py
|
│ ├── __init__.py
|
||||||
│ ├── conftest.py
|
│ ├── conftest.py
|
||||||
@ -167,7 +196,7 @@ This is what you'll find in the `app-gen-tool` repository:
|
|||||||
│ │ ├── adminer-0.2.1.tgz
|
│ │ ├── adminer-0.2.1.tgz
|
||||||
│ │ └── app-test.yaml
|
│ │ └── app-test.yaml
|
||||||
│ ├── test_application_class.py
|
│ ├── test_application_class.py
|
||||||
│ └── test_camel_case.py
|
│ └── test_common_functions.py
|
||||||
├── test-requirements.txt
|
├── test-requirements.txt
|
||||||
└── tox.ini
|
└── tox.ini
|
||||||
```
|
```
|
||||||
|
@ -4,18 +4,18 @@ appManifestFile-config:
|
|||||||
appVersion: 1.0-1
|
appVersion: 1.0-1
|
||||||
namespace: default
|
namespace: default
|
||||||
chart:
|
chart:
|
||||||
|
# - name: adminer
|
||||||
|
# version: 0.2.1
|
||||||
|
# path: https://github.com/cetic/helm-adminer.git # git example path
|
||||||
|
# chartGroup: chartGroup-test
|
||||||
- name: adminer
|
- name: adminer
|
||||||
version: 0.2.1
|
version: 0.2.1
|
||||||
path: https://github.com/cetic/helm-adminer.git # git example path
|
path: app-gen-tool/example/helm-adminer/adminer-0.2.1.tgz # tar example path
|
||||||
chartGroup: chartGroup-test
|
|
||||||
- name: tempo-vulture
|
|
||||||
version: 0.4.1
|
|
||||||
path: app-gen-tool/example/tempo-vulture/tempo-vulture-0.4.1.tgz # tar example path
|
|
||||||
chartGroup: chartGroup-test
|
|
||||||
- name: poc-starlingx
|
|
||||||
version: 1.5.2
|
|
||||||
path: app-gen-tool/example/poc-starlingx-messages # dir example path
|
|
||||||
chartGroup: chartGroup-test
|
chartGroup: chartGroup-test
|
||||||
|
# - name: poc-starlingx
|
||||||
|
# version: 1.5.2
|
||||||
|
# path: app-gen-tool/example/poc-starlingx-messages # dir example path
|
||||||
|
# chartGroup: chartGroup-test
|
||||||
|
|
||||||
metadataFile-config:
|
metadataFile-config:
|
||||||
upgrades:
|
upgrades:
|
||||||
|
BIN
example/helm-adminer/adminer-0.2.1.tgz
Normal file
BIN
example/helm-adminer/adminer-0.2.1.tgz
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -30,8 +30,8 @@ class CommonFunctions:
|
|||||||
try:
|
try:
|
||||||
if not os.path.exists(tmp_folder):
|
if not os.path.exists(tmp_folder):
|
||||||
os.makedirs(tmp_folder, exist_ok=False)
|
os.makedirs(tmp_folder, exist_ok=False)
|
||||||
app_name = 'tempo-vulture'
|
app_name = 'adminer'
|
||||||
tarfile = 'tempo-vulture-0.4.1.tgz'
|
tarfile = 'adminer-0.2.1.tgz'
|
||||||
tarfile_path = os.path.join(self.resource_folder, tarfile)
|
tarfile_path = os.path.join(self.resource_folder, tarfile)
|
||||||
extract(tarfile_path, tmp_folder)
|
extract(tarfile_path, tmp_folder)
|
||||||
assert os.path.exists(os.path.join(tmp_folder, app_name))
|
assert os.path.exists(os.path.join(tmp_folder, app_name))
|
||||||
@ -45,15 +45,13 @@ class CommonFunctions:
|
|||||||
|
|
||||||
def test_transform_path_function(self):
|
def test_transform_path_function(self):
|
||||||
rel_path_1 = '../../../../example/poc-starlingx-messages'
|
rel_path_1 = '../../../../example/poc-starlingx-messages'
|
||||||
rel_path_2 = '../../../../example/tempo-vulture/tempo-vulture-0.4.1.tgz'
|
rel_path_2 = '../../../../example/adminer/adminer-0.2.1.tgz'
|
||||||
rel_path_3 = './resources/adminer-0.2.1.tgz'
|
rel_path_3 = './resources/adminer-0.2.1.tgz'
|
||||||
tar_name_1 = '/tempo-vulture-0.4.1.tgz'
|
tar_name_1 = '/adminer-0.2.1.tgz'
|
||||||
tar_name_2 = '/adminer-0.2.1.tgz'
|
|
||||||
abs_path_1 = transform_rel_path_into_abs_path(rel_path_1)
|
abs_path_1 = transform_rel_path_into_abs_path(rel_path_1)
|
||||||
abs_path_2 = transform_rel_path_into_abs_path(rel_path_2)
|
abs_path_2 = transform_rel_path_into_abs_path(rel_path_2)
|
||||||
abs_path_3 = transform_rel_path_into_abs_path(rel_path_3)
|
abs_path_3 = transform_rel_path_into_abs_path(rel_path_3)
|
||||||
abs_path_2 = abs_path_2.replace(tar_name_1, '', 1)
|
abs_path_2 = abs_path_2.replace(tar_name_1, '', 1)
|
||||||
abs_path_3 = abs_path_3.replace(tar_name_2, '', 1)
|
|
||||||
if os.path.exists(abs_path_1) and os.path.exists(abs_path_2) and os.path.exists(abs_path_3):
|
if os.path.exists(abs_path_1) and os.path.exists(abs_path_2) and os.path.exists(abs_path_3):
|
||||||
assert True
|
assert True
|
||||||
assert False
|
assert False
|
||||||
|
Loading…
Reference in New Issue
Block a user