Changeset 12569 for utils/CI/sette/all_functions.sh

Timestamp:

2020-03-18T12:22:56+01:00 (4 years ago)

Author:

mathiot

Message:

ticket #2304: merge branch sette_ticket2304 into sette (thank you Simon for the review and all the suggestions you made). It include synchronisation and cleaning option between the REF config and the _ST config to ease the work when the reference configurations are changed and display bug in sette_check_avail_rev

File:

• utils/CI/sette/all_functions.sh (modified) (2 diffs)

utils/CI/sette/all_functions.sh

@@ -91 +91 @@
 usage=" if value is a string ths is neede syntax : ./set_namelist namelist_name var_name \"new_value\" "
 
+# sync MYSRC files (input CFG and CFG_ST)
+sync_config() {
+   if [ ${SYNC_CONFIGS} == "yes" ]; then
+
+      lREF=$3/$1    # reference 
+      lCFG=$3/$2    # target
+
+      echo '-------------------------------------------------------------------------------'
+      echo '                    SOURCE AND CONFIG FILES SYNCHRONISATION                    '
+      echo ''
+      echo "configuration $lCFG/MY_SRC will be synchronised with $lREF/MY_SRC"
+      echo ''
+      # synchronise MY_SRC if $lCFG directory exist
+      if [ -d $lREF/MY_SRC ] && [ -d $lCFG ] ; then
+
+         if [ -d $lCFG/MY_SRC ] ; then
+
+            # Manage case number of file in MY_SRC changes
+            # find number of file only in $lCFG/MY_SRC
+            FCFG=`diff -r $lREF/MY_SRC $lCFG/MY_SRC | grep "Only in $lCFG/MY_SRC" | awk '{print $4}'`
+
+            # if more than 0, trigger a cleaning as Makenemo do not properly manage this case.
+            if [ ! -z "$FCFG" ]; then 
+               echo ''
+               echo "$lCFG contains a different file list than $lREF :"
+               diff -r $lREF/MY_SRC $lCFG/MY_SRC | grep "Only in $lCFG/MY_SRC" | awk '{print $4}'
+               echo "Synchronisation is not enough because Makenemo does not handle well case where a file in MY_SRC is removed"
+               echo "Therefore, we need to clean $lCFG before starting runing it"
+               echo ''
+               CLEAN_CONFIGS="yes"
+            fi
+         fi
+
+         # synchronisation $lREF/MY_SRC directory (and delete file in target location if needed)
+         rsync -a --delete $lREF/MY_SRC/ $lCFG/MY_SRC
+
+         # rsync keep preserve the modification time stamp.
+         # To avoid case where a file in MY_SRC is replace by an older file, we touch the file
+         touch $lCFG/MY_SRC/*
+      fi
+
+      echo ''
+      echo "configuration $lCFG/EXP00 will be synchronised with $lREF/EXPREF"
+      echo "(links are skipped)"
+      echo ''
+      # synchronize EXPREF
+      if [ -d $lREF/EXPREF ] && [ -d $lCFG/EXP00 ] ; then
+         rsync -a --no-links $lREF/EXPREF/ $lCFG/EXP00/.
+      fi
+      echo '-------------------------------------------------------------------------------'
+   fi
+}
+
+# clean _ST config (input CFG CFG_ST TYPE (test or ref))
+clean_config() {
+   if [ ${CLEAN_CONFIGS} == "yes" ]; then
+      lREF=$1
+      lCFG=$2
+      lTYP=$3
+      echo ''
+      echo '-------------------------------------------------------------------------------'
+      echo '                         CLEANING CONFIGURATION                                '
+      echo ''
+      echo "./makenemo -n $lCFG -a/-r $lREF clean"
+      echo ''
+      if [ ${lTYP} == 'tests' ]; then
+         ./makenemo -n $lCFG -a $lREF clean
+      elif [ ${lTYP} == 'cfgs' ]; then
+         ./makenemo -n $lCFG -r $lREF clean
+      else
+         echo 'ERROR in the cleaning process'; exit 42
+      fi
+      echo ''
+      echo "$lCFG configuration has been cleaned"
+      echo ''
+      echo '-------------------------------------------------------------------------------'
+   fi
+}
+
 # define validation dir
 set_valid_dir () {
-    LANG=en_US
-    REVISION_NB=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'`
+    REVISION_NB=`${SVN_CMD} info ${SETTE_DIR}/.. | grep "Last Changed Rev" | awk '{print $NF}'`
     if [ ${#REVISION_NB} -eq 0 ]
     then
@@ -156 +234 @@
                 LINEVAR=$( grep -s -n "$VAR_NAME" ${EXE_DIR}/$NAMREF | awk -F: '{ { print $1} }' )
                 echo " $VAR_NAME found in ${EXE_DIR}/$NAMREF at line $LINEVAR " >> ${SETTE_DIR}/output.sette
+
 #   search for namelist group name
                 NAMGRP=$( head -n$LINEVAR ${EXE_DIR}/$NAMREF | grep --line-buffered "^&nam" | tail -1 | awk -F" " '{ { print $1} }' ) 
                 echo " variable $VAR_NAME will be added in $NAMGRP namelist-group of namelist file ${EXE_DIR}/$1 " >> ${SETTE_DIR}/output.sette
+
+# check if namelist group present in namelist_cfg
+# if missing group is added at the end of namelist_cfg
+                NGRP=$(grep ${NAMGRP} ${EXE_DIR}/$1 | wc -l )
+                if [ ${NGRP} -eq 0 ]; then
+                   echo ''                                                                          >> ${SETTE_DIR}/output.sette
+                   echo "+++++ Group ${NAMGRP} containing ${2} is missing in ${EXE_DIR}/$1 +++++ "  >> ${SETTE_DIR}/output.sette
+                   echo "+++++ Group ${NAMGRP}                 is added   in ${EXE_DIR}/$1 +++++ "  >> ${SETTE_DIR}/output.sette
+                   echo ''                                                                          >> ${SETTE_DIR}/output.sette
+                   echo "&${NAMGRP}" >> ${EXE_DIR}/$1
+                   echo "/"          >> ${EXE_DIR}/$1
+                fi
+
 # Add $VARNAME in namelist file ${EXE_DIR}/$1 in namelist group $NAMGRP
 # on mac osx, replace sed --posix by gsed (available with mac port)
                 sed --posix "/${NAMGRP} /a\ ${VAR_NAME} " ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp || gsed --posix "/${NAMGRP} /a\ ${VAR_NAME} " ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp
+
 # if file not empty replace ${EXE_DIR}/$1
-                if [ -s ${EXE_DIR}/$1.tmp ] ; then
+               if [ -s ${EXE_DIR}/$1.tmp ] ; then
                    mv ${EXE_DIR}/$1.tmp ${EXE_DIR}/$1 
                 else