Changeset 12505

Timestamp:

2020-03-03T15:15:48+01:00 (3 years ago)

Author:

mathiot

Message:

#2304 : fix issues related to MY_SRC synchronisation when files are removed

Location:

utils/CI/sette_ticket2304

Files:

• all_functions.sh (modified) (5 diffs)
• param.cfg (modified) (1 diff)
• sette.sh (modified) (1 diff)

utils/CI/sette_ticket2304/all_functions.sh

@@ -93 +93 @@
 # sync MYSRC files (input CFG and CFG_ST)
 sync_config() {
-   if [ ${SETTE_SYNC_CONFIGS} == "yes" ]; then
+   if [ ${SYNC_CONFIGS} == "yes" ]; then
+
+      echo "configuration $3/$2 will be synchronised with $3/$1"
+
       lREF=$3/$1    # reference 
       lCFG=$3/$2    # target
-      if [ -d $lREF/MY_SRC ] && [ -d $lCFG/MY_SRC ] ; then
-         rsync $lREF/MY_SRC/* $lCFG/MY_SRC/.
+
+      # 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 $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 $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 -av --delete $lREF/MY_SRC/ $lCFG/MY_SRC
       fi
 
+      # synchronize EXPREF
       if [ -d $lREF/EXPREF ] && [ -d $lCFG/EXP00 ] ; then
          rsync $lREF/EXPREF/*namelist*_cfg  $lCFG/EXP00/.
@@ -106 +132 @@
          rsync $lREF/EXPREF/file_def_*.xml  $lCFG/EXP00/.
       fi
+
    fi
 }
@@ -111 +138 @@
 # clean _ST config (input CFG CFG_ST TYPE (test or ref))
 clean_config() {
-   if [ ${SETTE_CLEAN_CONFIGS} == "yes" ]; then
+   if [ ${CLEAN_CONFIGS} == "yes" ]; then
       lREF=$1
       lCFG=$2
@@ -122 +149 @@
          echo 'ERROR in the cleaning process'; exit 42
       fi
+      echo ''
+      echo "$lCFG configuration has been cleaned"
+      echo ''
    fi
 }
@@ -199 +229 @@
                 NGRP=$(grep ${NAMGRP} ${EXE_DIR}/$1 | wc -l )
                 if [ ${NGRP} -eq 0 ]; then
-                   echo ''
-                   echo "+++++ Group ${NAMGRP} containing ${2} is missing in ${EXE_DIR}/$1 +++++ "      
-                   echo "+++++ Group ${NAMGRP}                 is added   in ${EXE_DIR}/$1 +++++ "      
-                   echo ''
+                   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

utils/CI/sette_ticket2304/param.cfg

@@ -65 +65 @@
 #TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
 # cleaning CFG_ST
-SETTE_CLEAN_CONFIGS=${SETTE_CLEAN_CONFIGS:-"no"}
+CLEAN_CONFIGS=${SETTE_CLEAN_CONFIGS:-"no"}
 # synchronisation MY_SRC and EXP00 of CFG_ST with MY_SRC and EXPREF form CFG
-SETTE_SYNC_CONFIGS=${SETTE_SYNC_CONFIGS:-"no"}
+SYNC_CONFIGS=${SETTE_SYNC_CONFIGS:-"no"}
 # ------------------------------------------------------------------------------------------
 #

utils/CI/sette_ticket2304/sette.sh

@@ -9 +9 @@
      case $option in
         c) export SETTE_CLEAN_CONFIGS='yes'
+           export SETTE_SYNC_CONFIGS='yes'
            echo ""
-           echo "Configuration $SETTE_TEST_CONFIGS will be cleaned"
+           echo "Configuration $SETTE_TEST_CONFIGS will be cleaned; this option enforces also synchronisation"
            echo "";;
         s) export SETTE_SYNC_CONFIGS='yes'