commit 65b21fb98c91205518d5bb761a5f96f2736c71e5
author Patrick Williams <patrick@stwcx.xyz> Fri Feb 12 21:21:14 2021 -0600
committer Patrick Williams <patrick@stwcx.xyz> Thu Feb 18 07:29:32 2021 -0600
tree 78a666d8be4c44bcfe8f8dc7e94223cebc46d76b
parent 38c6b7dd26ebd566a7d914e3d28d08bab3df3d0a

build-unit-test-docker: use Gerrit revision if available

If Jenkins is triggering us to run CI on a package that is included
in the Docker image itself, use the requested revision-under-test as
part of the Docker image build process.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I61a0a249123800aba860ab1535e96f5cdb2ec63f

scripts/build-unit-test-docker

diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 38a4508..ae34417 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -421,6 +421,15 @@
         if "rev" in self.pkg_def:
             return
 
+        # Check if Jenkins/Gerrit gave us a revision and use it.
+        if gerrit_project == self.package and gerrit_rev:
+            print(
+                f"Found Gerrit revision for {self.package}: {gerrit_rev}",
+                file=sys.stderr,
+            )
+            self.pkg_def["rev"] = gerrit_rev
+            return
+
         # Ask Github for all the branches.
         lookup = git("ls-remote", "--heads", f"https://github.com/{self.package}")
 
@@ -635,6 +644,9 @@
 ubuntu_mirror = os.environ.get("UBUNTU_MIRROR")
 http_proxy = os.environ.get("http_proxy")
 
+gerrit_project = os.environ.get("GERRIT_PROJECT")
+gerrit_rev = os.environ.get("GERRIT_PATCHSET_REVISION")
+
 # Set up some common variables.
 username = os.environ.get("USER", "root")
 homedir = os.environ.get("HOME", "/root")