reqmgr2ms-monitor 2.3.5rc3__tar.gz → 2.3.6rc2__tar.gz

{reqmgr2ms-monitor-2.3.5rc3/src/python/reqmgr2ms_monitor.egg-info → reqmgr2ms-monitor-2.3.6rc2}/PKG-INFO

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

reqmgr2ms-monitor-2.3.6rc2/bin/docker.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+# Author: Valentin Kuznetsov <vkuznet@gmail.com>
+# helper script to handle docker actions
+
+if [ $# -ne 4 ]; then
+     echo "Usage: docker.sh <action> <service> <tag> <registry> "
+     echo "Supported actions: build, push"
+     exit 1;
+fi
+
+# helper function to match the pattern X.Y.Z where X, Y, and Z are numbers
+function match_tag {
+  local tag=$1
+  if [[ $tag =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
+    return 0
+  elif [[ $tag =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# make input variable assignments
+action=$1
+service=$2
+tag=$3
+registry=$4
+rurl=$registry/cmsweb/$service
+
+# check if action is supported
+case "$action" in
+  "build"|"push")
+    ;;
+  *)
+    echo "action: '$action' is not supported"
+    exit 1
+    ;;
+esac
+
+# determine suffix of image tag
+suffix=""
+if match_tag "$tag"; then
+    suffix="-stable"
+fi
+
+# check build/push actions and build the image(s) if it will be required
+if [ "$action" == "build" ]; then
+    echo "action: docker build --build-arg TAG=${tag} --tag ${rurl}:${tag}"
+    docker build --build-arg TAG=${tag} --tag ${rurl}:${tag} .
+    docker images | grep $tag | grep $service
+
+    if [ -z "$suffix" ]; then
+        echo "Building stable image for tag=$tag is not appropriate as tag is not matched X.Y.Z or X.Y.Z.P pattern"
+        exit 0
+    fi
+
+    echo "action: docker build --build-arg TAG=${tag} --tag ${rurl}:${tag}${suffix}"
+    docker build --build-arg TAG=${tag} --tag ${rurl}:${tag}${suffix} .
+    docker images | grep ${tag}${suffix} | grep $service
+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`
+    echo $image_exist
+    echo $image_exist_stable
+    
+    if [ -z "$image_exist" ]; then
+        echo "Images ${rurl}:${tag} not found"
+        exit 1
+    fi
+    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
+    fi
+    echo "action: docker push ${rurl}:${tag}${suffix}"
+    docker push ${rurl}:${tag}${suffix}
+fi

reqmgr2ms-monitor-2.3.6rc2/bin/patchComponent.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+usage()
+{
+    echo -ne "\nA simple script to facilitate component patching\n"
+    echo -ne "and to decrease the development && testing turnaround time.\n"
+    echo -ne "Usage: \n"
+    echo -ne "\t sudo ./patchComponent.sh 11270\n"
+    echo -ne "\t git diff --no-color | sudo ./patchComponent.sh \n or:\n"
+    echo -ne "\t curl https://patch-diff.githubusercontent.com/raw/dmwm/WMCore/pull/11270.patch | sudo ./patchComponent.sh \n"
+    exit 1
+}
+
+# if fd 0 (stdin) is open and refers to a terminal - then we are running the script directly, without a pipe
+# if fd 0 (stdin) is open but does not refer to the terminal - then we are running the script through a pipe
+if [ -t 0 ] ; then pipe=false; else pipe=true ; fi
+
+patchNum=$1
+shift
+
+[[ -z $patchNum ]] && patchNum=temp
+echo "Patching WMCore code with PR: $pathcNum"
+
+currTag=$(python -c "from WMCore import __version__ as WMCoreVersion; print(WMCoreVersion)")
+echo "Current WMCoreTag: $currTag"
+
+
+# Find all possible locations for the component source
+# NOTE: We always consider PYTHONPATH first
+pythonLibPaths=$(echo $PYTHONPATH |sed -e "s/\:/ /g")
+pythonLibPaths="$pythonLibPaths $(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")"
+
+for path in $pythonLibPaths
+do
+    [[ -d $path/WMCore ]] && { pythonLibPath=$path; echo "Source code found at: $path"; break ;}
+done
+
+[[ -z $pythonLibPath  ]] && { echo "ERROR: Could not find WMCore source to patch"; exit  1 ;}
+echo "Current PythonLibPath: $pythonLibPath"
+
+stripLevel=3
+patchFile=/tmp/$patchNum.patch
+
+patchCmd="patch -t --verbose -b --version-control=numbered -d $pythonLibPath -p$stripLevel"
+
+
+if $pipe
+then
+    # if we run through a pipeline create the temporary patch file for later parsing
+    echo "Creating a temporary patchFile at: $patchFile"
+    cat <&0 > $patchFile
+else
+    echo "Downloading a temporary patchFile at: $patchFile"
+    curl https://patch-diff.githubusercontent.com/raw/dmwm/WMCore/pull/$patchNum.patch -o $patchFile
+fi
+
+
+echo "Refreshing all files which are to be patched from the origin"
+for file in `grep diff $patchFile |grep "a/src/python" |awk '{print $3}' |sort |uniq`
+do
+    file=${file#a\/src\/python\/}
+    echo orig: https://raw.githubusercontent.com/dmwm/WMCore/$currTag/src/python/$file
+    echo dest: $pythonLibPath/$file
+    curl -f https://raw.githubusercontent.com/dmwm/WMCore/$currTag/src/python/$file  -o $pythonLibPath/$file || { \
+        echo file: $file missing at the origin.
+        echo Seems to be a new file for the curren patch.
+        echo Removing it from the destination as well!
+        rm -f $pythonLibPath/$file
+    }
+done
+
+echo "Patching all files starting from the original version"
+echo "cat $patchFile | $patchCmd"
+cat $patchFile | $patchCmd

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

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

{reqmgr2ms-monitor-2.3.5rc3 → reqmgr2ms-monitor-2.3.6rc2/src/python/reqmgr2ms_monitor.egg-info}/PKG-INFO

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

{reqmgr2ms-monitor-2.3.5rc3 → reqmgr2ms-monitor-2.3.6rc2}/src/python/reqmgr2ms_monitor.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ bin/create-iam-token.sh
 bin/createStoreResults.py
 bin/dbsbuffer-file-fix.py
 bin/deploy-rpm-to-jenkins.sh
+bin/docker.sh
 bin/fix-dbs-parentage
 bin/inject-to-config-cache
 bin/kill-workflow-in-agent

reqmgr2ms-monitor-2.3.5rc3/bin/patchComponent.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-usage()
-{
-    echo -ne "\nA simple script to facilitate component patching\n"
-    echo -ne "and to decrease the development && testing turnaround time.\n"
-    echo -ne "Usage: \n"
-    echo -ne "\t git diff --no-color | sudo ./patchComponent.sh (wmagent | reqmon | reqmgr2 | reqmgr2ms...)\n or:\n"
-    echo -ne "\t curl https://patch-diff.githubusercontent.com/raw/dmwm/WMCore/pull/11270.patch | sudo ./patchComponent.sh (wmagent | reqmon | reqmgr2 | reqmgr2ms...)\n"
-    exit 1
-}
-
-# TODO: To check against a list of components
-component=$1
-[[ -z $component ]] && usage
-
-echo "Patching component: $component"
-
-if [[ $component == "wmagent" ]]
-then
-    rootDir=/data/srv/$component/current/apps.sw/$component/lib/python*/site-packages
-else
-    rootDir=/data/srv/current/apps.sw/$component/lib/python*/site-packages/
-fi
-
-stripLevel=3
-
-patch --verbose -b --version-control=numbered -d $rootDir -p$stripLevel