Create image tags based on Jenkins run to avoid race condition (#759)

Use the username and abbreviated git hash, if available, to create unique Docker image tags. Also specifies Docker centos7 base image SHA (other OS are not used currently). 

Example with git info:

REPOSITORY         TAG                                                                    IMAGE ID
nisar-adt/isce3    centos7conda-nisar-yzheng-5f3e4714     39c58c69f136
nisar-adt/isce3    centos7conda-yzheng-5f3e4714           753d172c2241
nisar-adt/isce3dev centos7conda-dev-yzheng-5f3e4714       c854b0666f86
nisar-adt/isce3dev centos7conda-runtime-yzheng-5f3e4714   88d3297e2c85

Example without git info:

REPOSITORY         TAG                         IMAGE ID
nisar-adt/isce3    centos7conda-nisar-yzheng   1235fbd655e3
nisar-adt/isce3    centos7conda-yzheng         f3a110d9b86
nisar-adt/isce3dev centos7conda-dev-yzheng     c854b0666f86
nisar-adt/isce3dev centos7conda-runtime-yzheng 88d3297e2c85

Author: yzheng6

tools/imagesets/centos7conda/distrib_nisar/Dockerfile

@@ -1,6 +1,6 @@
 ARG distrib_img
 # create intermediate image to hide credentials
-FROM alpine as distrib_nisar_tmp
+FROM alpine 
 
 # install git
 RUN apk add git
@@ -21,9 +21,9 @@ RUN conda install testfixtures scikit-image
 RUN conda install cfunits --channel conda-forge
 
 # copy the repo from the intermediate image
-COPY --from=distrib_nisar_tmp /opt/QualityAssurance /opt/QualityAssurance
-COPY --from=distrib_nisar_tmp /opt/CFChecker /opt/CFChecker
-COPY --from=distrib_nisar_tmp /opt/calTools /opt/calTools
+COPY --from=0 /opt/QualityAssurance /opt/QualityAssurance
+COPY --from=0 /opt/CFChecker /opt/CFChecker
+COPY --from=0 /opt/calTools /opt/calTools
 
 # install 
 RUN cd /opt/QualityAssurance \

tools/imagesets/centos7conda/runtime/Dockerfile

@@ -1,4 +1,5 @@
-FROM nvidia/cuda:11.0-base-centos7
+# Use specific version of nvidia/cuda:11.0-base-centos7 image
+FROM nvidia/cuda@sha256:260c6346ca819adcfb71993ad44c0d0623ab93ce6df67567eec9d2278da07802
 
 # Trying to install a package that doesn't exist should be an error.
 RUN yum update -y \

tools/imagesets/imgset.py

@@ -1,4 +1,4 @@
-import os, subprocess, sys, shutil, stat, logging, shlex
+import os, subprocess, sys, shutil, stat, logging, shlex, getpass
 # see no evil
 from .workflowdata import workflowdata, workflowtests
 pjoin = os.path.join
@@ -65,11 +65,31 @@ class ImageSet:
 
     cpack_generator = "RPM"
 
-    def imgname(self, img):
-        return f"nisar-adt/isce3dev:{self.name}-{img}" # labels used for above images
+    def imgname(self, repomod="", tagmod=""):
+        """
+        Return unique Docker image name per Jenkins run, uses Jenkins environment variables
+        JOB_NAME and EXECUTOR_NUMBER
+
+        Parameters
+        ----------
+        repomod : str, optional
+            Modifier to nominal Docker repository name
+        tagmod : str, optional
+            Modifier to nominal Docker tag name
+            
+        """
+        if tagmod != "":
+            tagmod = "-" + tagmod
+        try:
+            gitmod = '-' + subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).decode('ascii').strip()
+        except:
+            gitmod = ""
+        return f"nisar-adt/isce3{repomod}:{self.name}{tagmod}" \
+               + f"-{getpass.getuser()}{gitmod}" 
 
     def docker_run(self, img, cmd):
-        runcmd = f"{docker} run {self.run_args} --rm -i {self.tty} {self.imgname(img)} bash -ci"
+        runcmd = f"{docker} run {self.run_args} --rm -i {self.tty} " \
+                 + f"{self.imgname(repomod='dev', tagmod=img)} bash -ci"
         subprocess.check_call(runcmd.split() + [cmd])
 
     def docker_run_dev(self, cmd):
@@ -97,7 +117,7 @@ def __init__(self, name, *, projblddir, printlog=False):
         self.testdir = projblddir + "/workflow_testdata_tmp/test"
         self.build_args = f'''
             --network=host
-        ''' + " ".join(f"--build-arg {x}_img={self.imgname(x)}" for x in self.imgs)
+        ''' + " ".join(f"--build-arg {x}_img={self.imgname(repomod='dev', tagmod=x)}" for x in self.imgs)
 
         self.cmake_defs = {
             "WITH_CUDA": "YES",
@@ -135,7 +155,8 @@ def setup(self):
         (should not change often, so these will usually be cached)
         """
         for img in self.imgs:
-            cmd = f"{docker} build {self.build_args} {thisdir}/{self.name}/{img} -t {self.imgname(img)}"
+            cmd = f"{docker} build {self.build_args} {thisdir}/{self.name}/{img}" \
+                  + f" -t {self.imgname(repomod='dev', tagmod=img)}"
             subprocess.check_call(cmd.split())
 
     def configure(self):
@@ -192,7 +213,7 @@ def makedistrib(self):
         squash_arg = "--squash" if "Experimental: true" in docker_info else ""
 
         cmd = f"{docker} build {self.build_args} {squash_arg} \
-                    {thisdir}/{self.name}/distrib -t nisar-adt/isce3:{self.name}"
+                    {thisdir}/{self.name}/distrib -t {self.imgname()}"
         subprocess.check_call(cmd.split())
 
 
@@ -202,11 +223,11 @@ def makedistrib_nisar(self):
         noise estimator caltool
         """
 
-        build_args = f"--build-arg distrib_img=nisar-adt/isce3:{self.name} \
+        build_args = f"--build-arg distrib_img={self.imgname()} \
                        --build-arg GIT_OAUTH_TOKEN={os.environ.get('GIT_OAUTH_TOKEN').strip()}"
 
         cmd = f"{docker} build {build_args} \
-                {thisdir}/{self.name}/distrib_nisar -t nisar-adt/isce3:{self.name}-nisar"
+                {thisdir}/{self.name}/distrib_nisar -t {self.imgname(tagmod='nisar')}"
         subprocess.check_call(cmd.split())
 
 
@@ -280,10 +301,9 @@ def distribrun(self, testdir, cmd, logfile=None, dataname=None, nisarimg=False,
         logger.addHandler(hdlr)
 
         if nisarimg:
-            tag = self.name + "-nisar"
+            img = self.imgname(tagmod="nisar")
         else:
-            tag = self.name
-        img = 'nisar-adt/isce3:' + tag
+            img = self.imgname()
 
         datamount = ""
         if dataname is not None:
@@ -560,4 +580,3 @@ def tartests(self):
             for test in workflowtests[workflow]:
                 print(f"\ntarring workflow test {test}\n")
                 subprocess.check_call(f"tar cvzf {test}.tar.gz {test}".split(), cwd=self.testdir)
-