Changeset 23149 for issm/trunk-jpl/test/NightlyRun/runme.py

Timestamp:

08/21/18 13:06:49 (7 years ago)

Author:

kruegern

Message:

NEW: added python method of excluding tests in jenkins using test ids or words/sub-words from the test names. Fixed type in jenkins.sh. Testing exclusion of Dakota on linux64_ross only for now.

File:

• issm/trunk-jpl/test/NightlyRun/runme.py (modified) (6 diffs)

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -6 +6 @@
 from glob import glob
 from socket import gethostname
+from IdFromString import *
 
 def runme(id=None,exclude=None,benchmark='nightly',procedure='check',output='none',rank=1,numprocs=1):
@@ -20 +21 @@
             Available options:
                'id'            followed by the list of ids requested
-               'exclude'       ids to be excluded from the test
+               'exclude'       ids or (parts of) test names to be excluded from the test
                'benchmark'     'all' (all of the tests)
                           'nightly' (nightly run/ daily run)
@@ -39 +40 @@
                runme()
                runme(exclude=101)
+               runme(exclude='Dakota')
+               runme(exclude=[[101,102],['Dakota','Slr']])
                runme(id=102,procedure='update')
         """
@@ -92 +95 @@
         # }}}
         #GET exclude {{{
-        if exclude:
-                if isinstance(exclude,list):
-                        exclude_ids=exclude
-                else:
-                        exclude_ids=[exclude]
-                test_ids=test_ids.difference(set(exclude_ids))
-#       print 'test_ids after exclude =',test_ids
-        # }}}
+        exclude_ids = []
+        if np.size(exclude) > 0:
+                # 1 exclusion, either an id or a test name
+                if type(exclude) == str:
+                        exclude_ids = IdFromString(exclude)
+                if type(exclude) == int:
+                        exclude_ids = [exclude]
+
+                # many exclusions of either ids or test names
+                if type(exclude) == list and len(exclude) > 0:
+                        # is everything a string or int?
+                        if np.array([type(i) == int for i in exclude]).all():
+                                exclude_ids = exclude
+                        elif np.array([type(i) == str for i in exclude]).all():
+                                exclude_ids = np.concatenate([IdFromString(i) for i in exclude])
+
+                # many exclusions of both ids and test names
+                # exclude[0] -> exclude by id
+                # exclude[1] -> exclude by test name
+                if type(exclude) == list and len(exclude) == 2:
+                        if type(exclude[0]) == list and len(exclude[0]) > 0 and type(exclude[0][0]) == int:
+                                exclude_ids = np.concatenate([exclude_ids,exclude[0]])
+                        if type(exclude[1]) == list and len(exclude[1]) > 0 and type(exclude[1][0]) == str:
+                                exclude_ids = np.concatenate([exclude_ids,np.concatenate([IdFromString(i) for i in exclude[1]])])
+
+                # no recognizable exclusion
+                if np.size(exclude_ids) == 0:
+                        print exclude
+                        raise RuntimeError('''runme.py: exclude (-e/-exclude) and exclude-name (-en/-exclude_name) options must appear as one of the following:
+
+exclude=101                                     OR -e 101
+exclude=\'Dakota\'                              OR -en 'Dakota'
+exclude=[101,102...]                            OR -e 101 102 ...
+exclude=[\'Dakota\',\'Slr\'...]                 OR -en 'Dakota' 'Slr' ...
+exclude=[[101,102...],[\'Dakota\',\'Slr\'...]]  OR -e 101 102 ... -en 'Dakota' 'Slr' ...
+''')
+                test_ids=test_ids.difference(exclude_ids)
+        print 'test_ids after exclude =',sorted(test_ids)
+        # }}}
+        return
         #Process Ids according to benchmarks {{{
         if benchmark=='nightly':
@@ -248 +283 @@
         parser.add_argument('-i','--id', nargs='*', type=int, help='followed by the list of ids requested', default=[])
         parser.add_argument('-e','--exclude', nargs='+', type=int, help='ids to be excluded from the test', default=[])
+        parser.add_argument('-en','--exclude_name', nargs='+', type=str, help='test names to be excluded from the test', default=[])
         parser.add_argument('-b','--benchmark', help='nightly/ismip/eismint/thermal/mesh/...', default='nightly')
         parser.add_argument('-p','--procedure', help='check/update', default='check')
@@ -255 +291 @@
         args = parser.parse_args()
 
-        md = runme(args.id, args.exclude, args.benchmark, args.procedure, args.output, args.rank, args.numprocs)
+        md = runme(args.id, [args.exclude,args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs)
 
         if args.output=='nightly':