Add support for m1 processors and fix behaviour on mac

Author: mijaros

Diff for: osia/installer/downloader/install.py

@@ -15,10 +15,10 @@
 # limitations under the License.
 """Module responsible for download of openshift-install binary"""
 from shutil import copyfileobj
-from sys import platform
 from tempfile import NamedTemporaryFile
 from pathlib import Path
 from typing import Tuple, Optional
+import platform
 
 import logging
 import re
@@ -35,16 +35,18 @@
 BUILD_ROOT = "https://openshift-release-artifacts.svc.ci.openshift.org/"
 PREVIEW_ROOT = "http://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/"
 
-VERSION_RE = re.compile(r"^openshift-install-(?P<platform>\w+)-(?P<version>.*)\.tar\.gz")
+VERSION_RE = re.compile(r"^openshift-install-(?P<platform>\w+)(?P<architecture>-\w+)?-(?P<version>\d+.*)\.tar\.gz")
 EXTRACTION_RE = re.compile(r'.*Extracting tools for .*, may take up to a minute.*')
 
 
 def _current_platform():
-    if platform == "linux":
-        return platform
-    if platform == "darwin":
-        return "mac"
-    raise Exception(f"Unrecognized platform {platform}")
+    if platform.system() == "Linux" and platform.machine() == "x86_64":
+        return "linux", None
+    if platform.system() == "Darwin" and platform.machine() == "arm64":
+        return "mac", "arm64"
+    if platform.system() == "Darwin" and platform.machine() == "x86_64":
+        return "mac", None
+    raise Exception(f"Unrecognized platform {platform.system()} {platform.machine()}")
 
 
 def get_url(directory: str) -> Tuple[Optional[str], Optional[str]]:
@@ -55,9 +57,12 @@ def get_url(directory: str) -> Tuple[Optional[str], Optional[str]]:
     tree = BeautifulSoup(lst.content, 'html.parser')
     links = tree.find_all('a')
     installer, version = None, None
+    os_name, arch = _current_platform()
     for k in links:
         match = VERSION_RE.match(k.get('href'))
-        if match and match.group('platform') == _current_platform():
+        if match and match.group('platform') == os_name:
+            if (arch and not match.group('architecture')) or (not arch and match.group('architecture')):
+                continue
             installer = lst.url + k.get('href')
             version = match.group('version')
     return installer, version