From 114aba0d898e4f7dd863d40d2281f961ba52589d Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 7 Nov 2022 17:21:36 +0100 Subject: [PATCH] test SMESH branch yan/parallel_mesh3 on all nodes but DB09 & DB10 --- applications/SALOME-master-native.pyconf | 3 ++- applications/SALOME-master.pyconf | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index fb90642..31f3b2a 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -148,7 +148,7 @@ APPLICATION : 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' - 'SMESH' + 'SMESH' : 'yan/parallel_mesh3' 'NETGENPLUGIN' 'BLSURFPLUGIN' 'GHS3DPLUGIN' @@ -235,6 +235,7 @@ __overwrite__ : # - Qt minimal version 5.12 # - xmlpatterns executable __condition__ : "VARS.dist in ['DB10']" + 'APPLICATION.products.SMESH' : 'master' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip' } diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index e1e5d3d..702ca87 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -150,7 +150,7 @@ APPLICATION : 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' - 'SMESH' + 'SMESH' : 'yan/parallel_mesh3' 'NETGENPLUGIN' 'BLSURFPLUGIN' 'GHS3DPLUGIN' @@ -228,6 +228,10 @@ __overwrite__ : 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_CO8' } # spns #29324 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'} } + { + __condition__ : "VARS.dist in ['DB09']" + 'APPLICATION.products.SMESH' : 'master' + } { __condition__ : "VARS.dist in ['DB10']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] -- 2.39.2