Replace apache bitnami image with httpd image in the basic_cnf test

- bitnami is only publishing images under the latest tag now
- this has lead to an ImagePullBackoff issue in the cnf test
- use a httpd image in the basic_cnf_cba_enriched.zip
- add a README in the artifacts folder to describe commands
  needed to unzip and rezip the artifact for future reference

Issue-ID: INT-2333
Change-Id: I7e9198a05fb2c8a0f2ac29a401e5044fc046e852
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/README.md b/README.md
index 367b08f..35f4836 100644 (file)
--- a/README.md
+++ b/README.md
@@ -7,22 +7,24 @@ instantiate services on ONAP
 
 A basic example is implemented in the python file
 
-- run_basicvm_multicloud_yaml.py
+- `run_basicvm_multicloud_yaml.py`
 
 The global datas defined in these files (see input_datas) shall be
 adapted to your environment.
 
-In addition you must define your service in directory templates/vnf-services
-and create zip file for heat template templates/heat_files.
+In addition you must define your service in directory `templates/vnf-services`
+and create zip file for heat template `templates/heat_files`.
 
 ### Prepare your environment and run tests
 
 - Clone the project (using instantiation branch)
+
   ```shell
   git clone https://gerrit.onap.org/r/testsuite/pythonsdk-tests.git
   ```
 
 - Create a virtual environment and clone the python-onapsdk
+
   ```shell
   virtualenv my_test
   source my_test/bin/activate
@@ -42,14 +44,17 @@ and create zip file for heat template templates/heat_files.
 
 - Set OpenStack configuration: there are 2 ways to provide the cloud information
   If you got the clouds.yaml, you need to reference your cloud with the env
-  variable OS_TEST_CLOUD
+  variable `OS_TEST_CLOUD`
+
   ```shell
   export OS_TEST_CLOUD=cloud-name-referenced-in-the-cloud-configuration
   ```
+
   If you do not have access to the cloud config, you must precise all the
   parameters manually
 
 - Export the setting file in a environment variable
+
   ```shell
   export ONAP_PYTHON_SDK_SETTINGS=onaptests.configuration.basic_vm_multicloud_yaml_settings
   ```
@@ -63,12 +68,12 @@ environment and configuration.
   ssh user@onap.pod4.opnfv.fr -D 1080
   ```
 
-- Once the different input datas are updated in run_\*.py files and
+- Once the different input datas are updated in `run_\*.py` files and
   that the templates files for your service are defined, start to run
   the different steps:
   ```shell
   python run_basicvm_nomulticloud.py
   ```
 
-- By default, all the logs are stored in the file pythonsdk.debug.log.
-  The file name and location can be set in the settings.py
+- By default, all the logs are stored in the file `pythonsdk.debug.log`.
+  The file name and location can be set in the `settings.py`

diff --git a/src/onaptests/templates/artifacts/README.md b/src/onaptests/templates/artifacts/README.md
new file mode 100644 (file)
index 0000000..9f51f54
--- /dev/null
+++ b/src/onaptests/templates/artifacts/README.md
@@ -0,0 +1,21 @@
+# artifacts
+
+## Updating the `.zip` archives
+
+```sh
+ARCHIVE=basic_cnf_cba_enriched
+# unzip into dedicated folder of same name
+unzip $ARCHIVE.zip -d $ARCHIVE
+```
+
+Edit the content, then
+
+```sh
+cd $ARCHIVE
+zip -r ../$ARCHIVE.zip *
+```
+
+```sh
+cd ..
+rm -rf $ARCHIVE
+```

diff --git a/src/onaptests/templates/artifacts/basic_cnf_cba_enriched.zip b/src/onaptests/templates/artifacts/basic_cnf_cba_enriched.zip
index be5c4da..06e101e 100644 (file)
Binary files a/src/onaptests/templates/artifacts/basic_cnf_cba_enriched.zip and b/src/onaptests/templates/artifacts/basic_cnf_cba_enriched.zip differ