Changeset 12444 for utils/CI

Timestamp:

2020-02-24T15:14:49+01:00 (4 years ago)

Author:

mathiot

Message:

Corrections after Simon review: add AGRIF context file in the synchronisation, update sette_rpt.sh to keep old and new usage available, update sette comments and issue with old set as revision in get_dorv (ticket #2304)

Location:

utils/CI/sette_ticket2304

Files:

• all_functions.sh (modified) (1 diff)
• sette.sh (modified) (1 diff)
• sette_rpt.sh (modified) (3 diffs)

utils/CI/sette_ticket2304/all_functions.sh

@@ -103 +103 @@
          rsync $lREF/EXPREF/*namelist*_cfg  $lCFG/EXP00/.
          rsync $lREF/EXPREF/iodef.xml       $lCFG/EXP00/.
-         rsync $lREF/EXPREF/context_*.xml   $lCFG/EXP00/.
+         rsync $lREF/EXPREF/*context_*.xml  $lCFG/EXP00/.
          rsync $lREF/EXPREF/file_def_*.xml  $lCFG/EXP00/.
       fi

utils/CI/sette_ticket2304/sette.sh

@@ -5 +5 @@
 
 # Parse command-line arguments
-#
-#  -t "test configurations": select active test configurations
-#                            (overrides selection made using
-#                            environment variable SETTE_TEST_CONFIGS)
-
 if [ $# -gt 0 ]; then
   while getopts t:csh option; do 

utils/CI/sette_ticket2304/sette_rpt.sh

@@ -15 +15 @@
     dorv=`ls -1rt $vdir/$nam/$mach/ | tail -1l `
     dorv=`echo $dorv | sed -e 's:.*/::'`
-    dorv2=`ls -1rt $vdir/$nam2/$mach/ | tail -1l `
+    dorv2=`ls -1rt $vdir/$nam2/$mach/ 2>/dev/null | tail -1l `
     dorv2=`echo $dorv2 | sed -e 's:.*/::'`
   else
@@ -442 +442 @@
        case $option in
           c) mach=$OPTARG;;
-          r) lastchange=$OPTARG;;
+          r) rev=$OPTARG;;
           h | *) echo ''
                  echo 'sette_rpt.sh : ' 
@@ -456 +456 @@
     shift $((OPTIND - 1))
 fi
+
+# if $1 (remaining arguments)
+if [[ ! -z $1 ]] ; then rev=$1 ; fi
+
+# by default use the current lastchanged revision
+lastchange=${rev:-$lastchange}
 
 echo ""