spns #32755 - test develop branch before integration

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index fa6e21aa791e20c635fb7cc06e9a521aa5c3c594..82383241ab59b4207217827004c99c89f5904375 100644 (file)
--- 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 3723b68fa920f3ad8601830a187c2675a8546b39..254474a26bee93249a2a0a6709acd731252b65e2 100644 (file)
--- 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']"