Merge "Our bare repos need to have casablanca branch"

2 files changed, 8 insertions, 16 deletions

diff --git a/build/creating_data/download-bin-tools.sh b/build/creating_data/download-bin-tools.sh
index d363bde9..a87fa204 100755
--- a/build/creating_data/download-bin-tools.sh
+++ b/build/creating_data/download-bin-tools.sh
@@ -18,29 +18,21 @@
 
 usage () {
     echo "Usage:"
-    echo -e "./$(basename $0) <project version> [destination directory]\n"
+    echo -e "./$(basename $0) [destination directory]\n"
     echo "Examples:"
-    echo "  ./$(basename $0) onap_3.0.0 ./git-repo"
+    echo "  ./$(basename $0) ./git-repo"
 }
 
-if [ "${1}" == "-h" ] || [ -z "${1}" ] || [ -z "${2}"]; then
+if [ "${1}" == "-h" ] || [ -z "${1}" ] ; then
     usage
     exit 1
 else
-    TAG="${1}"
-    OUTDIR="${2}"
+    OUTDIR="${1}"
 fi
 
-if [ "${TAG}" == onap_2.0.0 ]; then
-    KUBECTL_VERSION=1.8.10
-    HELM_VERSION=2.8.2
-elif [ "${TAG}" == onap_3.0.0 ]; then
-    KUBECTL_VERSION=1.11.2
-    HELM_VERSION=2.9.1
-else
-    KUBECTL_VERSION=1.11.2
-    HELM_VERSION=2.9.1
-fi
+# we are keeping just casablanca support in casablanca branch
+KUBECTL_VERSION=${KUBECTL_VERSION:-1.11.2}
+HELM_VERSION=${HELM_VERSION:-2.9.1}
 
 mkdir -p "$OUTDIR"
 cd "$OUTDIR"
diff --git a/build/creating_data/download-git-repos.sh b/build/creating_data/download-git-repos.sh
index 0219eb6f..7853a141 100755
--- a/build/creating_data/download-git-repos.sh
+++ b/build/creating_data/download-git-repos.sh
@@ -24,7 +24,7 @@ usage () {
     echo "Usage:"
     echo -e "./$(basename $0) <repository list> [destination directory]\n"
     echo "Examples:"
-    echo "  ./$(basename $0) onap_3.0.0-git_repos.list ./git-repo"
+    echo "  ./$(basename $0) onap_3.0.x-git_repos.list ./git-repo"
 }
 
 LIST="${1}"