From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 27 Oct 2022 15:26:51 +0000 (+0200)
Subject: spns #32755 - test develop branch before integration
X-Git-Tag: V9_11_0~209
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3fe6a8af0f0b2af2c6fbc752853fb0c627c61bd2;p=tools%2Fsat_salome.git

spns #32755 - test develop branch before integration
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index fa6e21a..8238324 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -181,7 +181,7 @@ APPLICATION :
         'YDEFX'
         'pmml'
         'SOLVERLAB'
-        'TopIIVolMesh'
+        'TopIIVolMesh' : 'develop'
         #'TESTBASE'
         'CEATESTBASE' : 'SalomeV9'
     }
@@ -235,6 +235,7 @@ __overwrite__ :
         #   - Qt minimal version 5.12
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
+        'APPLICATION.products.TopIIVolMesh'    : 'master'
         'APPLICATION.products.SMESH'    : 'master'
         'APPLICATION.products.NETGENPLUGIN'    : 'master'
         'APPLICATION.products.opencv'   : '3.2.0'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 3723b68..254474a 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -183,7 +183,7 @@ APPLICATION :
         'YDEFX'
         'pmml'
         'SOLVERLAB' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
-        'TopIIVolMesh'
+        'TopIIVolMesh' : 'develop'
         #'TESTBASE'
         'CEATESTBASE' : 'SalomeV9'
     }
@@ -230,8 +230,9 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['DB09']"
-        'APPLICATION.products.SMESH' : 'master'
+        'APPLICATION.products.SMESH'        : 'master'
         'APPLICATION.products.NETGENPLUGIN' : 'master'
+        'APPLICATION.products.TopIIVolMesh' : 'master'
     }
     {
         __condition__ : "VARS.dist in ['DB10']"