Update DCAE MOD smoke/verification test using simple app

[testsuite.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 5888629..87cab0b 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -14,11 +14,9 @@ exec 2> >(tee -a ${LOG_FILE} >&2)
 # get the path
 path=$(pwd)
 pip install \
---pre \
 --no-cache-dir \
 --exists-action s \
 --target="$path/robot/library" \
---extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" \
 'robotframework-seleniumlibrary==3.3.1' \
 'robotframework-databaselibrary==1.2' \
 'robotframework-angularjs==0.0.9' \
@@ -26,34 +24,50 @@ pip install \
 'robotframework-sshlibrary==3.3.0' \
 'robotframework-ftplibrary==1.6' \
 'robotframework-archivelibrary==0.4.0' \
+'robotframework-jsonlibrary==0.3.1'
+
+pip install \
+--pre \
+--no-cache-dir \
+--exists-action s \
+--target="$path/robot/library" \
+--extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" \
 'robotframework-onap==0.6.0.*'
 
 # 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
-    # Support LF build location
-       cd $path/testsuite/heatbridge
-else
-       cd ~
-       git config --global http.sslVerify false
-       if [ -d ~/heatbridge ]
-       then
-               cd heatbridge
-               git pull origin master
-       else
-               git clone https://gerrit.onap.org/r/testsuite/heatbridge.git
-               cd heatbridge
-       fi
-fi
+###############################
+# remove heatbridge
+# commented out for testing
+################################################################
+#if [ -d $path/testsuite/heatbridge ]
+#then
+#    # Support LF build location
+#      cd $path/testsuite/heatbridge
+#else
+#      cd ~
+#      git config --global http.sslVerify false
+#      if [ -d ~/heatbridge ]
+#      then
+#              cd heatbridge
+#              git pull origin master
+#      else
+#              git clone https://gerrit.onap.org/r/testsuite/heatbridge.git
+#              cd heatbridge
+#      fi
+#fi
 
-pip install \
---no-cache-dir \
---upgrade \
---exists-action s \
---target="$path/robot/library" \
-./heatbridge
+#pip install \
+#--no-cache-dir \
+#--upgrade \
+#--exists-action s \
+#--target="$path/robot/library" \
+#./heatbridge
+
+#sed -i 's/cinderclient\.v1\.client/cinderclient\.v2\.client/g' /var/opt/ONAP/robot/library/heatbridge/OpenstackManager.py
+
+################################################################
 
 # Go back to execution folder
 cd $path
@@ -65,9 +79,9 @@ then
        # we need to update PATH with chromium-chromedriver
        echo "Adding in-container chromedriver to PATH"
        ln -s /usr/lib/chromium-browser/chromedriver /usr/local/bin/chromedriver
-       
+
        echo "Skipping desktop steps, building container image..."
-else   
+else
        #
        # Get the appropriate chromedriver. Default to linux64
        #
@@ -96,4 +110,4 @@ else
                unzip $CHROMEDRIVER_TARGET
        fi
        rm -rf $CHROMEDRIVER_TARGET
-fi
\ No newline at end of file
+fi