diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-08-06 06:20:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-08-06 06:20:07 +0000 |
| commit | 2b6bce7f8db3866133488f0a64f478569494f7b8 (patch) | |
| tree | a4e4cb5dc1c3147b3e713e43c707204934d27a6e /kud/tests/_common.sh | |
| parent | 4fb6acf5a720a0554c08a6f1d3526271b6317cdb (diff) | |
| parent | 7087e0b0297dbd043642ae9414f18efad71ebae6 (diff) | |
Merge changes Ia35fac70,I7ffaa3d4,I53e7e4d6
* changes:
Update plugin.sh with new helper functions
Provide connection info for plugin testcase
Correct k8splugin endpoint configuration in KUD test
Diffstat (limited to 'kud/tests/_common.sh')
| -rwxr-xr-x | kud/tests/_common.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/kud/tests/_common.sh b/kud/tests/_common.sh index f9f47f87..044891dd 100755 --- a/kud/tests/_common.sh +++ b/kud/tests/_common.sh @@ -27,10 +27,8 @@ unprotected_private_net=unprotected-private-net protected_private_net=protected-private-net ovn_multus_network_name=ovn-networkobj rbd_metadata=rbd_metatada.json -rbd_content_tarball=vault-consul-dev.tar rbp_metadata=rbp_metatada.json rbp_instance=rbp_instance.json -rbp_content_tarball=profile.tar # vFirewall vars demo_artifacts_version=1.5.0 @@ -1119,17 +1117,13 @@ DEPLOYMENT # populate_CSAR_rbdefinition() - Function that populates CSAR folder # for testing resource bundle definition function populate_CSAR_rbdefinition { - local csar_id=$1 - - _checks_args $csar_id - pushd ${CSAR_DIR}/${csar_id} + _checks_args "$1" + pushd "${CSAR_DIR}/$1" print_msg "Create Helm Chart Archives" - rm -f ${rbd_content_tarball}.gz - rm -f ${rbp_content_tarball}.gz - tar -cf $rbd_content_tarball -C $test_folder/vnfs/testrb/helm vault-consul-dev - tar -cf $rbp_content_tarball -C $test_folder/vnfs/testrb/helm/profile . - gzip $rbp_content_tarball - gzip $rbd_content_tarball + rm -f *.tar.gz + tar -czf rb_profile.tar.gz -C $test_folder/vnfs/testrb/helm/profile . + #Creates vault-consul-dev-0.0.0.tgz + helm package $test_folder/vnfs/testrb/helm/vault-consul-dev --version 0.0.0 popd } |