Merge pull request #196 from truenas/NAS-113190-22.02-RC.1

NAS-113190 / 22.02-RC.1 / Allow checking out all repos by providing an override (by sonicaj)

scale_build/config.py

@@ -17,6 +17,7 @@
 SIGNING_PASSWORD = os.getenv('SIGNING_PASSWORD')
 SKIP_SOURCE_REPO_VALIDATION = bool(int(os.getenv('SKIP_SOURCE_REPO_VALIDATION') or '0'))
 TRAIN = os.getenv('TRUENAS_TRAIN')
+TRUENAS_BRANCH_OVERRIDE = os.getenv('TRUENAS_BRANCH_OVERRIDE')
 TRY_BRANCH_OVERRIDE = os.getenv('TRY_BRANCH_OVERRIDE')
 if os.getenv('TRUENAS_VERSION'):
     VERSION = os.getenv('TRUENAS_VERSION')

scale_build/packages/git.py

@@ -2,7 +2,7 @@
 import os
 import shutil
 
-from scale_build.config import BRANCH_OVERRIDES, TRY_BRANCH_OVERRIDE
+from scale_build.config import BRANCH_OVERRIDES, TRUENAS_BRANCH_OVERRIDE, TRY_BRANCH_OVERRIDE
 from scale_build.exceptions import CallError
 from scale_build.utils.git_utils import (
     branch_checked_out_locally, branch_exists_in_repository, create_branch,
@@ -63,7 +63,9 @@ def existing_branch(self):
         return retrieve_git_branch(self.source_path)
 
     def get_branch_override(self):
-        gh_override = BRANCH_OVERRIDES.get(self.name)
+        # We prioritise TRUENAS_BRANCH_OVERRIDE over any individual branch override
+        # keeping in line with the behavior we used to have before
+        gh_override = TRUENAS_BRANCH_OVERRIDE or BRANCH_OVERRIDES.get(self.name)
 
         # TRY_BRANCH_OVERRIDE is a special use-case. It allows setting a branch name to be used
         # during the checkout phase, only if it exists on the remote.