From 74b54a0fd085af2288d6651ddae2cbbd34bdbabb Mon Sep 17 00:00:00 2001 From: Andrew McNab Date: Wed, 15 May 2024 20:18:05 +0100 Subject: [PATCH] awtWorkflowID is global --- containers/Dockerfile | 6 ------ containers/dev.conf | 2 +- modules/__init__.py | 3 ++- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/containers/Dockerfile b/containers/Dockerfile index 6fa8e15..07e84cc 100644 --- a/containers/Dockerfile +++ b/containers/Dockerfile @@ -94,12 +94,6 @@ COPY agents/justin-finder /usr/sbin/ COPY agents/justin-finder-bringonline /usr/sbin/ COPY agents/justin-job-factory /usr/sbin/ -COPY agents/justin-info-collector.service /usr/lib/systemd/system/ -COPY agents/justin-finder.service /usr/lib/systemd/system/ -#COPY agents/justin-finder-tape.service /usr/lib/systemd/system/ -COPY agents/justin-finder-bringonline.service /usr/lib/systemd/system/ -COPY agents/justin-job-factory.service /usr/lib/systemd/system/ - RUN mkdir -p /opt/rucio/etc/ COPY containers/rucio.cfg /opt/rucio/etc/rucio.cfg diff --git a/containers/dev.conf b/containers/dev.conf index 50b9bc7..c3ed235 100644 --- a/containers/dev.conf +++ b/containers/dev.conf @@ -5,7 +5,7 @@ # this line is checked by start-justin-httpd to determine pro / int / dev pro_dev = dev -# easier to set up as 500 +# easier to set up as 500 awt_workflow_id = 500 [database] diff --git a/modules/__init__.py b/modules/__init__.py index 04caca5..3ce580c 100644 --- a/modules/__init__.py +++ b/modules/__init__.py @@ -157,7 +157,8 @@ def readConf(): proDev, wlcgGroups, rucioProductionUser, justinAdmins, \ nonJustinFraction, htcondorSchedds, metacatAuthServerURL, \ metacatServerInputsURL, metacatServerOutputsURL, \ - jobscriptImagePrefix, jobscriptImageSuffix, jobscriptImageVersion + jobscriptImagePrefix, jobscriptImageSuffix, jobscriptImageVersion, \ + awtWorkflowID parser = configparser.RawConfigParser()