Changeset 12541 for utils/CI

Timestamp:

2020-03-12T18:05:24+01:00 (4 years ago)

Author:

mathiot

Message:

ticket #2304 : add description of -s and -c in the README, set verbosity of rsync to normal and update text output from sette

Location:

utils/CI/sette_ticket2304

Files:

• README.rst (modified) (1 diff)
• all_functions.sh (modified) (3 diffs)

utils/CI/sette_ticket2304/README.rst

@@ -81 +81 @@
              The list of available configurations is available in running ./sette_list_avail_cfg.sh.
           - user need to set up the param.cfg file correctly and download input file before running the script.
+          - user can enforce synchronisation (-s option) of the existing CFG_ST with the REF configuration (EXPREF and MY_SRC). 
+          - user can enforce cleaning of the CFG_ST configuration (use of makenemo -n CFG_ST clean) (-c option)
 * ``sette_rpt.sh``            : it generates the sette report.
           - if no argument is given, the report will be generated on the last changed revision.

utils/CI/sette_ticket2304/all_functions.sh

@@ -95 +95 @@
    if [ ${SYNC_CONFIGS} == "yes" ]; then
 
+      lREF=$3/$1    # reference 
+      lCFG=$3/$2    # target
+
       echo '-------------------------------------------------------------------------------'
       echo '                    SOURCE AND CONFIG FILES SYNCHRONISATION                    '
       echo ''
-      echo "configuration $3/$2 will be synchronised with $3/$1"
-      echo ''
-
-      lREF=$3/$1    # reference 
-      lCFG=$3/$2    # target
-
+      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
@@ -126 +125 @@
 
          # synchronisation $lREF/MY_SRC directory (and delete file in target location if needed)
-         rsync -av --delete $lREF/MY_SRC/ $lCFG/MY_SRC
+         rsync -a --delete $lREF/MY_SRC/ $lCFG/MY_SRC
 
          # rsync keep preserve the modification time stamp.
@@ -133 +132 @@
       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 -aq --no-links $lREF/EXPREF/ $lCFG/EXP00/.
+         rsync -a --no-links $lREF/EXPREF/ $lCFG/EXP00/.
       fi
       echo '-------------------------------------------------------------------------------'