Ben/fix collect exec (#493)

* use bs4 to collect link

* use bs4 and well-formed deved url

Author: ben-c-at-moz

collect_executables.py

@@ -103,6 +103,8 @@ def get_gd_platform():
         language = "en-US"
 
     if channel == "-devedition":
+        # Devedition has special requirements as it's testing a release
+
         this_devedition = BACKSTOP
         fx_download_dir_url = (
             "https://archive.mozilla.org/pub/devedition/releases/135.0b5/"
@@ -121,64 +123,64 @@ def get_gd_platform():
             fx_download_dir_url = next_candidate
 
         devedition_version = fx_download_dir_url.split("/")[-2]
-        if NUMBER_ONLY:
-            print(devedition_version)
-        else:
-            print(
-                f"{fx_download_dir_url}{get_fx_platform()}/{language}/Firefox%20{devedition_version}.{get_fx_executable_extension()}"
-            )
-        exit()
-
-    candidate_exists = True
-    this_beta = BACKSTOP
-    while candidate_exists:
-        (major, minor_beta) = this_beta.split(".")
-        (minor, beta) = minor_beta.split("b")
-        major = int(major)
-        minor = int(minor)
-        beta = int(beta)
-
-        next_major = f"{major + 1}.0b1"
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_major}-candidates/build1/"
-        rs = requests.get(fx_download_dir_url)
-        if rs.status_code < 300:
-            latest_beta_ver = next_major
-            this_beta = next_major
-            continue
-
-        next_minor = f"{major}.{minor + 1}b1"
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_minor}-candidates/build1/"
-        rs = requests.get(fx_download_dir_url)
-        if rs.status_code < 300:
-            latest_beta_ver = next_minor
-            this_beta = next_minor
-            continue
+        fx_download_dir_url = f"{fx_download_dir_url}{get_fx_platform()}/{language}/"
 
-        next_beta = f"{major}.{minor}b{beta + 1}"
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_beta}-candidates/build1/"
-        rs = requests.get(fx_download_dir_url)
-        if rs.status_code < 300:
-            latest_beta_ver = next_beta
-            this_beta = next_beta
-            continue
-
-        candidate_exists = False
+    else:
+        # Anything but devedition
 
-    status = 200
-    build = 0
-    while status < 400 and build < 20:
-        build += 1
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/"
+        candidate_exists = True
+        this_beta = BACKSTOP
+        while candidate_exists:
+            (major, minor_beta) = this_beta.split(".")
+            (minor, beta) = minor_beta.split("b")
+            major = int(major)
+            minor = int(minor)
+            beta = int(beta)
+
+            next_major = f"{major + 1}.0b1"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_major}-candidates/build1/"
+            rs = requests.get(fx_download_dir_url)
+            if rs.status_code < 300:
+                latest_beta_ver = next_major
+                this_beta = next_major
+                continue
+
+            next_minor = f"{major}.{minor + 1}b1"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_minor}-candidates/build1/"
+            rs = requests.get(fx_download_dir_url)
+            if rs.status_code < 300:
+                latest_beta_ver = next_minor
+                this_beta = next_minor
+                continue
+
+            next_beta = f"{major}.{minor}b{beta + 1}"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_beta}-candidates/build1/"
+            rs = requests.get(fx_download_dir_url)
+            if rs.status_code < 300:
+                latest_beta_ver = next_beta
+                this_beta = next_beta
+                continue
+
+            candidate_exists = False
+
+        status = 200
+        build = 0
+        while status < 400 and build < 20:
+            build += 1
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/"
+
+            # Fetch the page
+            response = requests.get(fx_download_dir_url)
+            status = response.status_code
 
-        # Fetch the page
-        response = requests.get(fx_download_dir_url)
-        status = response.status_code
+        # Correct build is the last one that didn't 404
+        build -= 1
+        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/{get_fx_platform()}/{language}/"
 
-    # Correct build is the last one that didn't 404
-    build -= 1
-    fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/{get_fx_platform()}/{language}/"
+    print(f"trying {fx_download_dir_url}")
     response = requests.get(fx_download_dir_url)
     status = response.status_code
+    print(f"response code: {status}")
     response_text = None
     for _ in range(3):
         if status < 300:
@@ -206,8 +208,11 @@ def get_gd_platform():
 
     fx_download_executable_url = rf"{fx_download_dir_url}{executable_name}"
     if NUMBER_ONLY:
-        number_cand = fx_download_dir_url.split("/")[6]
-        number = number_cand.split("-")[0]
-        print(f"{number}-build{build}")
+        if channel == "-devedition":
+            print(devedition_version)
+        else:
+            number_cand = fx_download_dir_url.split("/")[6]
+            number = number_cand.split("-")[0]
+            print(f"{number}-build{build}")
     else:
         print(fx_download_executable_url)