Add data list for bin utils

Since bin utils can be downloaded as simple http file
this script remove previous shell script and changes
documentation to add necessary steps.

Issue-ID: OOM-1803

Change-Id: I4ced011ce47302349f9e7db74d0ef7f0fe9c4fa0
Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com>

diff --git a/build/data_lists/infra_bin_utils.list b/build/data_lists/infra_bin_utils.list
new file mode 100644 (file)
index 0000000..8de616e
--- /dev/null
+++ b/build/data_lists/infra_bin_utils.list
@@ -0,0 +1,3 @@
+https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/linux/amd64/kubectl
+https://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-amd64.tar.gz
+https://github.com/rancher/rke/releases/download/v0.2.1/rke_linux-amd64

diff --git a/build/download/download-bin-tools.sh b/build/download/download-bin-tools.sh
deleted file mode 100755 (executable)
index 327e210..0000000
--- a/build/download/download-bin-tools.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#   COPYRIGHT NOTICE STARTS HERE
-#
-#   Copyright 2018-2019 © Samsung Electronics Co., Ltd.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-#   COPYRIGHT NOTICE ENDS HERE
-
-usage () {
-    echo "Usage:"
-    echo -e "./$(basename $0) [destination directory]\n"
-    echo "Examples:"
-    echo "  ./$(basename $0) ./downloads"
-}
-
-if [ "${1}" == "-h" ] || [ -z "${1}" ] ; then
-    usage
-    exit 1
-else
-    OUTDIR="${1}"
-fi
-
-# we are keeping just dublin support in dublin branch
-KUBECTL_VERSION=${KUBECTL_VERSION:-1.13.5}
-HELM_VERSION=${HELM_VERSION:-2.12.3}
-RKE_VERSION=${RKE_VERSION:-0.2.1}
-
-mkdir -p "$OUTDIR"
-cd "$OUTDIR"
-
-download() {
-    url="$1"
-    url_file="${url%%\?*}"
-    file=$(basename "$url_file")
-    echo "Downloading $url"
-    curl -s --retry 5 -y 10 -Y 10 --location  "$url" -o "$file"
-}
-
-download "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl"
-
-download "https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz"
-tar -xf ./helm-v${HELM_VERSION}-linux-amd64.tar.gz linux-amd64/helm -O > helm
-rm -f ./helm-v${HELM_VERSION}-linux-amd64.tar.gz
-
-download "https://github.com/rancher/rke/releases/download/v${RKE_VERSION}/rke_linux-amd64"
-mv rke_linux-amd64 rke
-
-chmod a+x ./helm ./kubectl ./rke
-
-exit 0

diff --git a/docs/BuildGuide.rst b/docs/BuildGuide.rst
index dfeabb0..cfddcc9 100644 (file)
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -102,7 +102,8 @@ so one might try following command to download most of the required artifacts in
         --git ./build/data_lists/onap_git_repos.list ../resources/git-repo \
         --npm ./build/data_lists/onap_npm.list ../resources/offline_data/npm_tar \
         --rpm ./build/data_lists/onap_rpm.list ../resources/pkg/rhel \
-        --pypi ./build/data_lists/onap_pip_packages.list ../resources/offline_data/pypi
+        --pypi ./build/data_lists/onap_pip_packages.list ../resources/offline_data/pypi \
+        --http ./build/data_lists/infra_bin_utils.list ../resources/downloads
 
 
 Alternatively, step-by-step procedure is described in Appendix 1.
@@ -126,9 +127,13 @@ ToDo: complete and verified list of http files will come just during/after vFWCL
 
 ::
 
-       # Following step will download and prepare rke, kubectl and helm binaries
-       # there is some post-processing needed therefore its not very convenient to add support for this step into main download.py script
-       ./build/download/download-bin-tools.sh ../resources/downloads
+       # Binaries are downloaded in step one but some post processing is still needed.
+       # This will be improved in future in installer itself
+
+       tar -xf ../resources/downloads/helm-v2.12.3-linux-amd64.tar.gz linux-amd64/helm -O > ../resources/downloads/helm
+       rm -f ../resources/downloads/helm-v2.12.3-linux-amd64.tar.gz
+       mv ../resources/downloads/rke_linux-amd64 rke
+
 
 **Step 5 - Create repo**
 
@@ -300,7 +305,10 @@ ToDo: complete and verified list of http files will come just during/after vFWCL
 ::
 
        # Following step will download and prepare rke, kubectl and helm binaries
-       ./build/download/download-bin-tools.sh ../resources/downloads
+       ./build/download/download.py --http ./build/data_lists/infra_bin_utils.sh ../resources/downloads
+       tar -xf ../resources/downloads/helm-v2.12.3-linux-amd64.tar.gz linux-amd64/helm -O > ../resources/downloads/helm
+       rm -f ../resources/downloads/helm-v2.12.3-linux-amd64.tar.gz
+       mv ../resources/downloads/rke_linux-amd64 rke
 
 **Step 7 - rpms**