diff options
| -rw-r--r-- | onboarding/pom.xml | 2 | ||||
| -rwxr-xr-x | sdc-os-chef/scripts/docker_run.sh | 35 |
2 files changed, 27 insertions, 10 deletions
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} |