diff options
| author |   Mandeep Khinda <mandeep.khinda@amdocs.com> | 2017-10-26 17:46:43 +0000 |
|---|---|---|
| committer |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2017-11-23 20:48:56 +0000 |
| commit | 4d71aab20ec59b6e1fc14cab7f1c8a159837f1f7 (patch) | |
| tree | f8dba36ee9ecfe6130e6a10147d23337b373cdb6 /kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh | |
| parent | f730de57d22ecd618a71b6efa7e1558ccc0771da (diff) | |
bringing robot up to date with 1.1
-updates to various files that have changed in the VM version
-OpenO support (test success requires kube2msb and msb to be working)
-removed un-used -docker.sh scripts (I don't find them useful so I
am proposing to removing them here)
-updates to SDNC preload eliminates some old parameter subst.
we were doing.
-With these change and a temporary tweak to kube2msb that points it
to a rancher server (kubeMasterUrl) robot results are pretty much on
par with my VM deployment of ONAP:
==============================================================================
OpenECOMP ETE | FAIL |
31 critical tests, 25 passed, 6 failed
Issue-ID: OOM-382
Change-Id: I2e3bcfd6fce31b0e4de8b7d66be90c7490e04c5c
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh')
| -rwxr-xr-x | kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh index 962eea86ec..c50fa5f491 100755 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh +++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh @@ -6,14 +6,19 @@ CONFIG=/opt/config PROPERTIES=/opt/eteshare/config/vm_properties.py GLOBAL_VM_PROPERTIES="# File generated from /opt/config\n#\n" +HASH="GLOBAL_INJECTED_PROPERTIES={" +COMMA="" for f in `ls $CONFIG/*.txt`; do VALUE=`cat $f` NAME=${f%.*} NAME=${NAME##*/} - GLOBAL_VM_PROPERTIES=$"$GLOBAL_VM_PROPERTIES \"$NAME\" : \"$VALUE\",\n" + NAME=${NAME^^} + GLOBAL_VM_PROPERTIES=$"${GLOBAL_VM_PROPERTIES}GLOBAL_INJECTED_$NAME = \"$VALUE\"\n" + HASH=$"${HASH}${COMMA}\n\"GLOBAL_INJECTED_$NAME\" : \"$VALUE\"" + COMMA="," done -GLOBAL_VM_PROPERTIES=${GLOBAL_VM_PROPERTIES/%,\\n/\}} +HASH="${HASH}}\n" +GLOBAL_VM_PROPERTIES="${GLOBAL_VM_PROPERTIES}\n${HASH}" +GLOBAL_VM_PROPERTIES=${GLOBAL_VM_PROPERTIES} echo -e $GLOBAL_VM_PROPERTIES > $PROPERTIES -REGION=`cat $CONFIG/region.txt` -echo -e "\nGLOBAL_OPENSTACK_SERVICE_REGION = \"$REGION\"" >> /opt/eteshare/config/integration_robot_properties.py |