Merge remote-tracking branch 'origin/master' into software-cleanup

master/product/Vifib/tests/testVifibSkinSelection.py

@@ -123,7 +123,9 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
 vifib_web
+vifib_web_ui_test
 erp5_km
 erp5_km_theme
 erp5_knowledge_pad
@@ -177,6 +179,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -216,7 +220,9 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
 vifib_web
+vifib_web_ui_test
 erp5_free_fiber_request
 erp5_km
 erp5_km_theme
@@ -271,6 +277,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -311,7 +319,9 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
 vifib_web
+vifib_web_ui_test
 erp5_km
 erp5_km_theme
 erp5_knowledge_pad
@@ -365,6 +375,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -401,6 +413,8 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
+vifib_web_ui_test
 erp5_km
 erp5_knowledge_pad
 erp5_simulation
@@ -453,6 +467,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -488,6 +504,8 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
+vifib_web_ui_test
 erp5_km
 erp5_knowledge_pad
 erp5_simulation
@@ -540,6 +558,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -575,7 +595,9 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
 vifib_web
+vifib_web_ui_test
 erp5_free_fiber_request
 erp5_km
 erp5_knowledge_pad
@@ -630,6 +652,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -666,6 +690,8 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
+vifib_web_ui_test
 erp5_km
 erp5_km_theme
 erp5_knowledge_pad
@@ -720,6 +746,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -756,6 +784,8 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
+vifib_web_ui_test
 erp5_commerce_multiflex_layout
 erp5_km
 erp5_knowledge_pad
@@ -808,6 +838,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -843,6 +875,8 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
+vifib_web_ui_test
 erp5_km
 erp5_web_download_theme
 erp5_knowledge_pad
@@ -895,6 +929,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm
@@ -929,6 +965,8 @@ vifib_payzen
 vifib_simulation
 vifib_slap
 vifib_software_pdm
+vifib_test
+vifib_web_ui_test
 erp5_rss_style
 erp5_km
 erp5_knowledge_pad
@@ -981,6 +1019,8 @@ erp5_system_event
 erp5_tax_resource
 erp5_toolbox
 erp5_trade
+erp5_ui_test
+erp5_ui_test_core
 erp5_vcs
 erp5_web
 erp5_web_crm

slapos-client.cfg.example

@@ -6,23 +6,24 @@ cert_file = certificate file location coming from your slapos master account
 key_file = key file location coming from your slapos master account
 # Below are softwares supported by Vifib
 alias =
+  apache_frontend http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.74:/software/apache-frontend/software.cfg
   dotclear https://svn.erp5.org/repos/public/slapos/trunk/software_release.contribution/dotclear.Kinwai.YIP/software.cfg
-  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.40:/software/erp5/software.cfg
+  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.75:/software/erp5/software.cfg
   erp5scalabilitytestbed http://git.erp5.org/gitweb/slapos.git/blob_plain/erp5scalabilitytestbed:/software/erp5scalabilitytestbed/software.cfg
   erp5_branch http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5:/software/erp5/software.cfg
   factux https://www.tiolive.com/vifib/P-OSOE.Factux.Wilfried.Rodrigues/Base_download
   joomla https://svn.erp5.org/repos/public/slapos/trunk/software_release.contribution/joomla.Christophe.Laroulandie/software.cfg
   kumofs http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.64:/software/kumofs/software.cfg
-  kvm http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.43:/software/kvm/software.cfg
+  kvm http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.74:/software/kvm/software.cfg
   lightforum https://svn.erp5.org/repos/public/slapos/trunk/software_release.contribution/lightforum.Christophe.Lefloch/software.cfg
   mariadb http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.16-hotfix:/software/mariadb/software.cfg
   memcached http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.43:/software/memcached/software.cfg
   mysql http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.65:/software/mysql-5.1/software.cfg
-  nbd http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.35:/software/nbd/software.cfg
   nosqltester http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/nosqltestbed:/software/nosqltestbed/software.cfg
   respest https://www.tiolive.com/vifib/P-OSOE.Respest.BENHAMED/Base_download
   slaposwebrunner http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.66:/software/slaprunner/software.cfg
   testnode http://git.erp5.org/gitweb/slapos.git/blob_plain/testnode:/software/testnode/software.cfg
   vifib http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.30:/software/vifib/software.cfg
+  wordpress http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.75:/software/wordpress/software.cfg
   xwiki http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.46:/software/xwiki/software.cfg
   zabbixagent http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.5:/software/zabbix-agent/software.cfg