aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-08-07 11:15:46 -0400
committerDR695H <dr695h@att.com>2019-08-08 17:21:37 -0400
commitfacbc292869bee6cdaa40649e62e347091b63f96 (patch)
treed27fe5a80a9cc243efc132d7eb761be357429d70
parent0ccf9e324abf07067fd95bcb675df77f3a0016d9 (diff)
remove one last sdc warning
and also updating chrome driver and docker Issue-ID: TEST-184 Change-Id: If730bdd5365ab1ded28a071ff8d8bb41f342fb84 Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--robot/resources/sdc_interface.robot2
-rwxr-xr-xsetup.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/robot/resources/sdc_interface.robot b/robot/resources/sdc_interface.robot
index 4d5d4689..022b4b20 100644
--- a/robot/resources/sdc_interface.robot
+++ b/robot/resources/sdc_interface.robot
@@ -90,7 +90,7 @@ Distribute Model From SDC
\ ${loop_catalog_resource_id}= Setup SDC Catalog Resource ${zip} ${cds} ${resourceType}
# zip can be vFW.zip or vFWDT_VFWSNK.zip
\ ${resource_type_match}= Run Keyword If "${resourceType}"=='PNF' Get Regexp Matches ${zip} ${service}_(.*)\.csar 1
- \ ... ELSE Get Regexp Matches ${zip} ${service}_(.*)\.zip 1
+ ... ELSE Get Regexp Matches ${zip} ${service}_(.*)\.zip 1
# Need to be able to distribute preload for vFWCL vFWSNK and vFWDT vFWSNK to prepend service to vnf_type
\ ${resource_type_string}= Set Variable If len(${resource_type_match})==0 ${service} ${service}${resource_type_match[0]}
\ Set To Dictionary ${resource_types} ${resource_type_string} ${loop_catalog_resource_id}
diff --git a/setup.sh b/setup.sh
index 7972a0be..2e86d037 100755
--- a/setup.sh
+++ b/setup.sh
@@ -27,6 +27,8 @@ pip install \
'robotframework-archivelibrary==0.4.0' \
'robotframework-onap==0.5'
+# i dont why we need this, but lets protobuf work in docker
+touch /var/opt/ONAP/robot/library/google/__init__.py
if [ -d $path/testsuite/heatbridge ]
then
@@ -68,7 +70,7 @@ else
#
# Get the appropriate chromedriver. Default to linux64
#
- CHROMEDRIVER_URL=http://chromedriver.storage.googleapis.com/2.43
+ CHROMEDRIVER_URL=http://chromedriver.storage.googleapis.com/75.0.3770.140
CHROMEDRIVER_ZIP=chromedriver_linux64.zip
CHROMEDRIVER_TARGET=chromedriver.zip