From: Yuli Shlosberg <ys9693@att.com>
Date: Thu, 16 Nov 2017 14:07:11 +0000 (+0200)
Subject: Disable automatic automation execution
X-Git-Tag: 1.0.0-Amsterdam^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3b0818ee834354128208e704b08bdef8effa7816;p=sdc.git

Disable automatic automation execution

Change-Id: Ic50218f909ff01f4035fc68461fd1787599ba627
Issue-Id: SDC-662
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
---

diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 61a4e14b51..db3d475744 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -38,7 +38,7 @@
         <openecomp.sdc.common.version>${project.version}</openecomp.sdc.common.version>
 
         <!-- Onboarding 3rd party versions -->
-        <jtosca.version>1.1.1-SNAPSHOT</jtosca.version>
+        <jtosca.version>1.1.1</jtosca.version>
         <aspectj.version>1.8.9</aspectj.version>
         <bsh.version>2.0b5</bsh.version>
         <cassandra.version>2.1.9</cassandra.version>
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index ed4246d72c..79173c9654 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -56,19 +56,36 @@ fi
 
 RELEASE=latest
 LOCAL=false
-SKIPTESTS=false
+RUNTESTS=false
 DEBUG_PORT="--publish 4000:4000"
 
 while [ $# -gt 0 ]
 do
     case $1 in
-        -r | --release )     shift 1 ;  RELEASE=$1     ; shift 1 ;;
-        -e | --environment ) shift 1 ;  DEP_ENV=$1     ; shift 1 ;;
-	-p | --port )        shift 1 ;  PORT=$1        ; shift 1 ;;
-	-l | --local )     	        LOCAL=true     ; shift 1 ;;
-	-s | --skipTests )              SKIPTESTS=true ; shift 1 ;;
-        -h | --help )                   usage          ; exit  0  ;;
-        * )                        	usage          ; exit  1  ;;
+    -r | --release )
+          shift 1 ;
+          RELEASE=$1;
+          shift 1;;
+    -e | --environment )
+          shift 1;
+          DEP_ENV=$1;
+          shift 1 ;;
+    -p | --port )
+          shift 1 ;
+          PORT=$1;
+          shift 1 ;;
+    -l | --local )
+          LOCAL=true;
+          shift 1;;
+    -t | --runTests )
+          RUNTESTS=true;
+          shift 1 ;;
+    -h | --help )
+          usage;
+          exit  0;;
+         * )
+          usage;
+          exit  1;;
     esac
 done
 
@@ -187,7 +204,7 @@ echo -e ""
 
 # sanityDocker
 echo "docker run sdc-sanity..."
-if [ ${SKIPTESTS} = false ]; then
+if [ ${RUNTESTS} = true ]; then
 echo "Triger sanity docker, please wait..."
     if [ ${LOCAL} = false ]; then
 	   docker pull ${PREFIX}/sdc-sanity:${RELEASE}