From b76ddf0d4b95a765230a9a77b85d6ca41ab877cc Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 15 Apr 2016 12:57:18 +0000
Subject: [PATCH] Task #8437: Read docker tag from parset, fall back to same
version as PipelineControl
---
MAC/Services/src/PipelineControl.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/MAC/Services/src/PipelineControl.py b/MAC/Services/src/PipelineControl.py
index 1a4be9f4283..f41e74a2810 100755
--- a/MAC/Services/src/PipelineControl.py
+++ b/MAC/Services/src/PipelineControl.py
@@ -123,8 +123,9 @@ class Parset(dict):
return self[PARSET_PREFIX + "Observation.Cluster.ProcessingCluster.clusterName"] or "CEP2"
def dockerTag(self):
- # For now, return OUR tag
- return runCommand("docker-template", "${LOFAR_TAG}")
+ # Return the version set in the parset, and fall back to our own version.
+ return (self[PARSET_PREFIX + "Observation.ObservationControl.PythonControl.softwareVersion"] or
+ runCommand("docker-template", "${LOFAR_TAG}"))
def slurmJobName(self):
return str(self.treeId())
--
GitLab