Task #10898: Avoid dev/test environments from using the "latest" image, but...

Task #10898: Avoid dev/test environments from using the "latest" image, but use the version specific to the tested branch instead

MAC/Services/src/PipelineControl.py

@@ -72,6 +72,7 @@ from lofar.sas.otdb.OTDBBusListener import OTDBBusListener
 from lofar.sas.otdb.config import DEFAULT_OTDB_NOTIFICATION_BUSNAME, DEFAULT_OTDB_SERVICE_BUSNAME
 from lofar.sas.otdb.otdbrpc import OTDBRPC
 from lofar.common.util import waitForInterrupt
+from lofar.common import isProductionEnvironment
 from lofar.messaging.RPC import RPCTimeoutException, RPCException
 from lofar.sas.resourceassignment.resourceassignmentservice.rpc import RARPC
 from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAULT_BUSNAME as DEFAULT_RAS_SERVICE_BUSNAME
@@ -173,18 +174,24 @@ class Parset(dict):
 
   @staticmethod
   def defaultDockerImage():
-    return "lofar-pipeline:latest"
+    return "lofar-pipeline"
 
   @staticmethod
   def defaultDockerTag():
-    return "latest"
+    if isProductionEnvironment():
+        # "latest" refers to the current /production/ image
+        return "latest"
+    else:
+        # test/dev environments want to use their specific version, since they
+        # share images with the production environment
+        return runCommand("docker-template", "${LOFAR_TAG}")
 
   def dockerImage(self):
     # Return the version set in the parset, and fall back to our own version.
     image = self[PARSET_PREFIX + "Observation.ObservationControl.PythonControl.softwareVersion"]
 
     if not image:
-       return self.defaultDockerImage()
+       image = self.defaultDockerImage()
 
     if ":" in image:
        return image