Changeset 23176

Timestamp:

08/24/18 11:00:59 (7 years ago)

Author:

kruegern

Message:

NEW: added explicit include and exclude options to runme including ability to use test names as well as ids. Works with Jenkins.

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• GetIds.py (added)
• runme.py (modified) (7 diffs)

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

@@ -6 +6 @@
 from glob import glob
 from socket import gethostname
-from IdFromString import *
+from GetIds import *
 
 def runme(id=None,exclude=None,benchmark='nightly',procedure='check',output='none',rank=1,numprocs=1):
@@ -20 +20 @@
  
             Available options:
-               'id'            followed by the list of ids requested
-               'exclude'       ids or (parts of) test names to be excluded from the test
+               'id'            followed by the list of ids or (parts of) test names requested
+                                Note: runs all tests by default
+
+               'exclude'       ids or (parts of) test names to be excluded (same format as id)
+                                Note: exclude does nothing if 'id' is specified with different values
+
                'benchmark'     'all' (all of the tests)
                           'nightly' (nightly run/ daily run)
@@ -29 +33 @@
                           'mesh'   : validation of mesh tests
                           'adolc'  : validation of adolc tests
-                          'slr'   : validation of slr tests
+                          'slr'    : validation of slr tests
 
                'procedure'     'check' : run the test (default)
@@ -39 +43 @@
             Examples:
                runme()
-               runme(exclude=101)
-               runme(exclude='Dakota')
-               runme(exclude=[[101,102],['Dakota','Slr']])
-               runme(id=102,procedure='update')
+               runme(101)
+               runme('SquareShelf')
+               runme(exclude=2001)
+               runme(exclude='Dakota',benchmark='all')
+               runme(id=[[101,102],['Dakota','Slr']])
         """
 
@@ -84 +89 @@
         
         if id:
-                if isinstance(id,list):
-                        test_ids=id
-                else:
-                        test_ids=[id]
-                test_ids=set(test_ids).intersection(set(list_ids))
+                test_ids = set(GetIds(id)).intersection(set(list_ids))
         else:
-                test_ids=set(list_ids)
+                # if no tests are specifically provided, do them all
+                test_ids = set(list_ids)
                 
-                #print 'test_ids after list =',test_ids
+        #print 'test_ids after list =',test_ids
         # }}}
         #GET exclude {{{
-        exclude_ids = []
-        if exclude != None and 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:
-                        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)
+        exclude_ids = GetIds(exclude)
+
+        test_ids=test_ids.difference(exclude_ids)
         #print 'test_ids after exclude =',sorted(test_ids)
+        #return
         # }}}
         #Process Ids according to benchmarks {{{
@@ -280 +250 @@
         parser = argparse.ArgumentParser(description='RUNME - test deck for ISSM nightly runs')
         parser.add_argument('-i','--id', nargs='*', type=int, help='followed by the list of ids requested', default=[])
+        parser.add_argument('-in','--include_name', nargs='*', type=str, help='followed by the list of test names 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=[])
@@ -289 +260 @@
         args = parser.parse_args()
 
-        md = runme(args.id, [args.exclude,args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs)
+        md = runme([args.id,args.include_name], [args.exclude,args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs)
 
         if args.output=='nightly':