Improve bin utils symlink creation logic

Change-Id: I9f468b6c731aaa764340e8503e6f377faba522b2
Issue-ID: OOM-2665
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

1 files changed, 9 insertions, 14 deletions

diff --git a/build/package.py b/build/package.py
index 9c017b75..9cd35902 100755
--- a/build/package.py
+++ b/build/package.py
@@ -243,20 +243,15 @@ def build_offline_deliverables(build_version,
             if os.path.islink(file):
                 os.unlink(file)
 
-        rke_files = glob.glob(os.path.join('.', '**/rke_linux-amd64'), recursive=True)
-        os.symlink(rke_files[0], os.path.join(download_dir_path, rke_files[0].split('/')[-1]))
-
-        helm_tar_files = glob.glob(os.path.join('.', '**/helm-*-linux-amd64.tar.gz'), recursive=True)
-        os.symlink(helm_tar_files[0], os.path.join(download_dir_path, helm_tar_files[0].split('/')[-1]))
-
-        kubectl_files = glob.glob(os.path.join('.', '**/kubectl'), recursive=True)
-        os.symlink(kubectl_files[0], os.path.join(download_dir_path, kubectl_files[0].split('/')[-1]))
-
-        chartmuseum_files = glob.glob(os.path.join('.', '**/chartmuseum'), recursive=True)
-        os.symlink(chartmuseum_files[0], os.path.join(download_dir_path, chartmuseum_files[0].split('/')[-1]))
-
-        helm_push_files = glob.glob(os.path.join('.', '**/helm-push_*_linux_amd64.tar.gz'), recursive=True)
-        os.symlink(helm_push_files[0], os.path.join(download_dir_path, helm_push_files[0].split('/')[-1]))
+        bin_pattern_list = ['**/rke_linux-amd64',
+                            '**/helm-*-linux-amd64.tar.gz',
+                            '**/kubectl',
+                            '**/amd64/chartmuseum',
+                            '**/helm-push_*_linux_amd64.tar.gz']
+
+        for pattern in bin_pattern_list:
+            for bin_file in glob.glob(os.path.join('.', pattern), recursive=True):
+                os.symlink(bin_file, os.path.join(download_dir_path, bin_file.split('/')[-1]))
 
         os.chdir(script_location)
         # End of workaround