Tweak smoketest.sh script and fix typos in MP quickstart readme (#1550)

* Tweak smoketest.sh script and fix typos in MP quickstart readme
helidon-io · Mar 23, 2020 · b9f4172 · b9f4172
1 parent 11b4673
commit b9f4172
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/etc/scripts/smoketest.sh b/etc/scripts/smoketest.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -84,7 +84,6 @@ $(basename ${0}) [ --staged ] [ --giturl=URL ] [ --clean ] [--help ] --version=V
 EOF
 }
 
-readonly SCRATCH=$(mktemp -d /var/tmp/helidon-smoke.XXXX) 
 
 # parse command line args
 ARGS=( "${@}" )
@@ -138,6 +137,10 @@ fi
 
 readonly SCRIPT_DIR=$(dirname ${SCRIPT_PATH})
 
+readonly DATESTAMP=$(date +%Y-%m-%d)
+mkdir -p /var/tmp/helidon-smoke
+readonly SCRATCH=$(mktemp -d /var/tmp/helidon-smoke/${VERSION}-${DATESTAMP}.XXXX)
+
 if [ -z "${GIT_URL}" ] ; then
   cd ${SCRIPT_DIR}
   GIT_URL=$(git remote get-url origin)
@@ -176,6 +179,7 @@ full(){
 
 waituntilready() {
   # Give app a chance to start --retry will retry until it is up
+  # --retry-connrefused requires curl 7.51.0 or newer
   sleep 3
   curl -s --retry-connrefused --retry 3 -X GET http://localhost:8080/health/live
   echo
@@ -260,7 +264,7 @@ echo "===== Log file: ${OUTPUTFILE} ====="
 
 if [ ! -z "${CLEAN_MVN_REPO}" -a -d "${LOCAL_MVN_REPO}" ]; then
   echo "===== Cleaning release from local maven repository ${LOCAL_MVN_REPO}  ====="
-  find -d ${LOCAL_MVN_REPO}/io/helidon  -name ${VERSION} -type d -exec rm -rf {} \; 
+  find ${LOCAL_MVN_REPO}/io/helidon -depth  -name ${VERSION} -type d -exec rm -rf {} \;
 fi
 
 # Invoke command

diff --git a/examples/quickstarts/helidon-quickstart-mp/README.md b/examples/quickstarts/helidon-quickstart-mp/README.md
@@ -93,25 +93,25 @@ See https://github.com/oracle/helidon-build-tools/tree/master/helidon-maven-plug
 Start the application:
 
 ```
-./target/helidon-quickstart-se/bin/start
+./target/helidon-quickstart-mp/bin/start
 ```
 
 ### Multi-stage Docker build
 
 Build the "jlink" Docker Image
 
 ```
-docker build -t helidon-quickstart-se-jlink -f Dockerfile.jlink .
+docker build -t helidon-quickstart-mp-jlink -f Dockerfile.jlink .
 ```
 
 Start the application:
 
 ```
-docker run --rm -p 8080:8080 helidon-quickstart-se-jlink:latest
+docker run --rm -p 8080:8080 helidon-quickstart-mp-jlink:latest
 ```
 
 See the start script help:
 
 ```
-docker run --rm helidon-quickstart-se-jlink:latest --help
+docker run --rm helidon-quickstart-mp-jlink:latest --help
 ```