5 files changed, 15 insertions, 18 deletions
diff --git a/build/creating_data/create_nginx_image/01create-image.sh b/build/creating_data/create_nginx_image/01create-image.sh
index aa62e40a..4ca382a7 100755
--- a/build/creating_data/create_nginx_image/01create-image.sh
+++ b/build/creating_data/create_nginx_image/01create-image.sh
@@ -18,6 +18,8 @@
 #
 #   COPYRIGHT NOTICE ENDS HERE
 
+VERSION="$(cat $(dirname ${0})/VERSION)"
+
 IMG_DIR="${1}"
 
 if [[ ! -e $IMG_DIR ]]; then
@@ -26,5 +28,5 @@ fi
 
 script_dir="$(dirname ${BASH_SOURCE[0]})"
 cd "$script_dir"
-docker build -t own_nginx .
-docker -l error save -o "$IMG_DIR/own_nginx_latest.tar" "own_nginx:latest"
+docker build -t own_nginx:${VERSION} .
+docker -l error save -o "$IMG_DIR/own_nginx_${VERSION}.tar" "own_nginx:${VERSION}"
diff --git a/build/creating_data/create_nginx_image/Dockerfile b/build/creating_data/create_nginx_image/Dockerfile
index 6a14f221..27249ae9 100644
--- a/build/creating_data/create_nginx_image/Dockerfile
+++ b/build/creating_data/create_nginx_image/Dockerfile
@@ -20,6 +20,8 @@ FROM nginx:alpine
 
 RUN apk add --no-cache --update fcgiwrap git git-daemon spawn-fcgi
 
+ADD VERSION .
+
 COPY gitconfig /etc/
 
 CMD spawn-fcgi -M 666 -s /var/run/fcgiwrap.socket /usr/bin/fcgiwrap && \
diff --git a/build/creating_data/create_nginx_image/VERSION b/build/creating_data/create_nginx_image/VERSION
new file mode 100644
index 00000000..227cea21
--- /dev/null
+++ b/build/creating_data/create_nginx_image/VERSION
@@ -0,0 +1 @@
+2.0.0
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}"