reqmgr2ms-output 2.3.6rc2__tar.gz → 2.3.6rc3__tar.gz

{reqmgr2ms-output-2.3.6rc2/src/python/reqmgr2ms_output.egg-info → reqmgr2ms-output-2.3.6rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-output
-Version: 2.3.6rc2
+Version: 2.3.6rc3
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group

{reqmgr2ms-output-2.3.6rc2 → reqmgr2ms-output-2.3.6rc3}/bin/docker.sh

@@ -60,10 +60,8 @@ if [ "$action" == "build" ]; then
 fi
 
 if [ "$action" == "push" ]; then
-    image_exist=`docker images | grep $tag | grep $service | grep -v ${tag}${suffix}`
-    image_exist_stable=`docker images | grep ${tag}${suffix} | grep $service`
+    image_exist=$(docker images | grep $tag | grep $service | grep -v ${tag}-stable)
     echo $image_exist
-    echo $image_exist_stable
     
     if [ -z "$image_exist" ]; then
         echo "Images ${rurl}:${tag} not found"
@@ -72,10 +70,15 @@ if [ "$action" == "push" ]; then
     echo "action: docker push ${rurl}:${tag}"
     docker push ${rurl}:${tag}
 
-    if [ -n "$suffix" ] && [ -z "$image_exist_stable" ]; then
-        echo "Images ${rurl}:${tag}${suffix} not found"
-        exit 2
+    # now push the stable release
+    if [ -n "$suffix" ]; then
+        image_exist_stable=$(docker images | grep ${tag}${suffix} | grep $service)
+        echo $image_exist_stable
+        if [ -z "$image_exist_stable" ]; then
+            echo "Images ${rurl}:${tag}${suffix} not found"
+            exit 2
+        fi
+        echo "action: docker push ${rurl}:${tag}${suffix}"
+        docker push ${rurl}:${tag}${suffix}
     fi
-    echo "action: docker push ${rurl}:${tag}${suffix}"
-    docker push ${rurl}:${tag}${suffix}
 fi

{reqmgr2ms-output-2.3.6rc2 → reqmgr2ms-output-2.3.6rc3}/src/python/WMCore/MicroService/MSOutput/MSOutput.py

@@ -81,7 +81,10 @@ class MSOutput(MSCore):
         self.mode = mode
         self.msConfig.setdefault("limitRequestsPerCycle", 500)
         self.msConfig.setdefault("enableDataPlacement", False)
+        # Enable relval workflows to go to tape
         self.msConfig.setdefault("enableRelValCustodial", False)
+        # Enable relval workflows to go to disk
+        self.msConfig.setdefault("enableRelValDisk", False)
         self.msConfig.setdefault("excludeDataTier", [])
         self.msConfig.setdefault("rucioAccount", 'wmcore_transferor')
         self.msConfig.setdefault("rucioRSEAttribute", 'dm_weight')
@@ -737,8 +740,10 @@ class MSOutput(MSCore):
         :return: True if the dataset is allowed to pass, False otherwise
         """
         # Bypass every configuration for RelVals, keep everything on disk
+        # unless the disk option for this workflow is not enabled.
         if isRelVal:
-            return True
+            return self.msConfig['enableRelValDisk']
+
         dataTier = dataItem['Dataset'].split('/')[-1]
         if dataTier in self.msConfig['excludeDataTier']:
             self.logger.warning("Skipping dataset: %s because it's excluded in the MS configuration",

{reqmgr2ms-output-2.3.6rc2 → reqmgr2ms-output-2.3.6rc3}/src/python/WMCore/__init__.py

@@ -6,5 +6,5 @@ Core libraries for Workload Management Packages
 
 """
 
-__version__ = '2.3.6rc2'
+__version__ = '2.3.6rc3'
 __all__ = []

{reqmgr2ms-output-2.3.6rc2 → reqmgr2ms-output-2.3.6rc3/src/python/reqmgr2ms_output.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-output
-Version: 2.3.6rc2
+Version: 2.3.6rc3
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group