Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save bhearsum/498850e3338d0e6806a7c5e0fc46d3bd to your computer and use it in GitHub Desktop.
Save bhearsum/498850e3338d0e6806a7c5e0fc46d3bd to your computer and use it in GitHub Desktop.
diff --git a/testing/mozharness/scripts/release/update-verify-config-creator.py b/testing/mozharness/scripts/release/update-verify-config-creator.py
index 70dbce61db90..00a9db838cdf 100644
--- a/testing/mozharness/scripts/release/update-verify-config-creator.py
+++ b/testing/mozharness/scripts/release/update-verify-config-creator.py
@@ -20,16 +20,24 @@ from mozilla_version.gecko import GeckoVersion
from mozilla_version.version import VersionType
sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
from mozharness.base.log import DEBUG, FATAL, INFO, WARNING
from mozharness.base.script import BaseScript, PostScriptRun, PreScriptRun
+# working around https://bugzilla.mozilla.org/show_bug.cgi?id=1963805
+# in a horrible manner
+HACKY_MANUAL_TAG_MAPPING = {
+ "FIREFOX_139_0b2_RELEASE": "39cbe40113b5679b4c22462c9e3f586971649cb6",
+ "DEVEDITION_139_0b2_RELEASE": "39cbe40113b5679b4c22462c9e3f586971649cb6",
+ "FIREFOX_138_0_1_RELEASE": "faa00cfdb8e8703ba7de9a8687d2270cfbffc495",
+}
+
# ensure all versions are 3 part (i.e. 99.1.0)
# ensure all text (i.e. 'esr') is in the last part
class CompareVersion(LooseVersion):
version = ""
def __init__(self, versionMap):
parts = versionMap.split(".")
# assume version is 99.9.0, look for 99.0
@@ -553,16 +561,18 @@ class UpdateVerifyConfigCreator(BaseScript):
except Exception:
self.log(
"Unable to get file from local repo, trying from remote instead."
)
return self._get_files_from_remote_repo(rev, branch, path)[0]
def _get_files_from_repo_tag(self, product, version, *paths):
tag = "{}_{}_RELEASE".format(product.upper(), version.replace(".", "_"))
+ # use a hardcoded revision, if it exists for the tag
+ tag = HACKY_MANUAL_TAG_MAPPING.get(tag, tag)
if self.config.get("local_repo") and tag in self.hg_tags:
return self._get_files_from_local_repo(tag, *paths)
branch = self._get_branch_url(self.config["branch_prefix"], version)
return self._get_files_from_remote_repo(tag, branch, *paths)
def _get_files_from_local_repo(self, rev, *paths):
"""Retrieve multiple files from the local repo at a given revision"""
# Given how slow hg is to retrieve files at specific revisions,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment