Changeset 12290

Timestamp:

2019-12-30T17:12:30+01:00 (4 years ago)

Author:

mathiot

Message:

use rsync for sync instead of cp and remove sync of cpp key (ticket #2304)

Location:

utils/CI/sette_ticket2304

Files:

• all_functions.sh (modified) (2 diffs)
• sette_reference-configurations.sh (modified) (9 diffs)
• sette_test-cases.sh (modified) (5 diffs)

utils/CI/sette_ticket2304/all_functions.sh

@@ -96 +96 @@
 lCFG=cfgs/$2    # target
 if [ -d $lREF/MY_SRC ] ; then
-   cp $lREF/MY_SRC/* $lCFG/MY_SRC/*
+   rsync $lREF/MY_SRC/* $lCFG/MY_SRC/*
 fi
 }
@@ -106 +106 @@
 lCFG=cfgs/$2
 if [ -d $lREF/EXPREF ] ; then
-   cp $lREF/EXPREF/*namelist*_cfg  $lCFG/EXP00/.
-   cp $lREF/EXPREF/iodef.xml       $lCFG/EXP00/.
-   cp $lREF/EXPREF/context_*.xml   $lCFG/EXP00/.
-   cp $lREF/EXPREF/file_def_*.xml  $lCFG/EXP00/.
+   rsync $lREF/EXPREF/*namelist*_cfg  $lCFG/EXP00/.
+   rsync $lREF/EXPREF/iodef.xml       $lCFG/EXP00/.
+   rsync $lREF/EXPREF/context_*.xml   $lCFG/EXP00/.
+   rsync $lREF/EXPREF/file_def_*.xml  $lCFG/EXP00/.
 fi
 set +x
-}
-
-# sync cppkey file
-sync_cppcfg() {
-lREF=cfgs/$1
-lCFG=cfgs/$2
-if [ -f $lREF/cpp_$1.fcm ] ; then
-   cp $lREF/cpp_$1.fcm $lCFG/cpp_$2.fcm
-fi
 }
 

utils/CI/sette_ticket2304/sette_reference-configurations.sh

@@ -167 +167 @@
     sync_mysrc  GYRE_PISCES GYRE_PISCES_ST
     sync_expcfg GYRE_PISCES GYRE_PISCES_ST
-    sync_cppcfg GYRE_PISCES GYRE_PISCES_ST
     #
     . ./makenemo -m ${CMP_NAM} -n GYRE_PISCES_ST -r GYRE_PISCES -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -314 +313 @@
     sync_mysrc  ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST
     sync_expcfg ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST
-    sync_cppcfg ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST
     #
     . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_PISCES_ST -r ORCA2_ICE_PISCES -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -562 +560 @@
     sync_mysrc  ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST
     sync_expcfg ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST
-    sync_cppcfg ORCA2_OFF_PISCES ORCA2_OFF_PISCES_ST
     #
     . ./makenemo -m ${CMP_NAM} -n ORCA2_OFF_PISCES_ST -r ORCA2_OFF_PISCES -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -759 +756 @@
     sync_mysrc  AMM12 AMM12_ST
     sync_expcfg AMM12 AMM12_ST
-    sync_cppcfg AMM12 AMM12_ST
     #
     . ./makenemo -m ${CMP_NAM} -n AMM12_ST -r AMM12 -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -893 +889 @@
     sync_mysrc  ORCA2_SAS_ICE ORCA2_SAS_ICE_ST
     sync_expcfg ORCA2_SAS_ICE ORCA2_SAS_ICE_ST
-    sync_cppcfg ORCA2_SAS_ICE ORCA2_SAS_ICE_ST
     #
     . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_ICE_ST -r ORCA2_SAS_ICE -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -1034 +1029 @@
     sync_mysrc  ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST
     sync_expcfg ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST
-    sync_cppcfg ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST
     #
     . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_OBS_ST -r ORCA2_ICE_PISCES -d "OCE ICE"  -j 8 add_key "key_asminc ${ADD_KEYS}" del_key "key_top"
@@ -1159 +1153 @@
     sync_mysrc  AGRIF_DEMO AGRIF_DEMO_ST
     sync_expcfg AGRIF_DEMO AGRIF_DEMO_ST
-    sync_cppcfg AGRIF_DEMO AGRIF_DEMO_ST
     #
     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_ST -r AGRIF_DEMO -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -1435 +1428 @@
     sync_mysrc  AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST
     sync_expcfg AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST
-    sync_cppcfg AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST
     #
     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j 8 add_key "${ADD_KEYS}" del_key "key_agrif"
@@ -1479 +1471 @@
     sync_mysrc  SPITZ12 SPITZ12_ST
     sync_expcfg SPITZ12 SPITZ12_ST
-    sync_cppcfg SPITZ12 SPITZ12_ST
     #
     . ./makenemo -m ${CMP_NAM} -n SPITZ12_ST -r SPITZ12 -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"

utils/CI/sette_ticket2304/sette_test-cases.sh

@@ -169 +169 @@
     sync_mysrc  OVERFLOW OVERFLOW_ST
     sync_expcfg OVERFLOW OVERFLOW_ST
-    sync_cppcfg OVERFLOW OVERFLOW_ST
     #
     . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST -a OVERFLOW -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -273 +272 @@
     sync_mysrc  LOCK_EXCHANGE LOCK_EXCHANGE_ST
     sync_expcfg LOCK_EXCHANGE LOCK_EXCHANGE_ST
-    sync_cppcfg LOCK_EXCHANGE LOCK_EXCHANGE_ST
     #
     . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST -a LOCK_EXCHANGE -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -378 +376 @@
     sync_mysrc  VORTEX VORTEX_ST
     sync_expcfg VORTEX VORTEX_ST
-    sync_cppcfg VORTEX VORTEX_ST
     #
     . ./makenemo -m ${CMP_NAM} -n VORTEX_ST -a VORTEX -j 8  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -562 +559 @@
     sync_mysrc  ICE_AGRIF ICE_AGRIF_ST
     sync_expcfg ICE_AGRIF ICE_AGRIF_ST
-    sync_cppcfg ICE_AGRIF ICE_AGRIF_ST
     #
     . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST -a ICE_AGRIF -j 8  add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
@@ -754 +750 @@
     sync_mysrc  ISOMIP ISOMIP_ST
     sync_expcfg ISOMIP ISOMIP_ST
-    sync_cppcfg ISOMIP ISOMIP_ST
     #
     . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"