Commit cd8cff8f authored by Rafael Monnerat's avatar Rafael Monnerat

Update tested version for parameters to 1.0.327

See merge request !549
parents a23e9a04 a72558c9
...@@ -14,14 +14,9 @@ ...@@ -14,14 +14,9 @@
</thead> </thead>
<tbody> <tbody>
<tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" /> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
<tr> <tal:block define="name string:kvm">
<td colspan="3"><b> Set URL for the software release </b></td> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/set_software_for_parameter_test" />
</tr> </tal:block>
<tr>
<td>type</td>
<td>//input[@name='url_string']</td>
<td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.289/software/kvm/software.cfg</td>
</tr>
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" /> <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
<tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/wait_software_type_selection_default" /> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/wait_software_type_selection_default" />
......
...@@ -14,14 +14,9 @@ ...@@ -14,14 +14,9 @@
</thead> </thead>
<tbody> <tbody>
<tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" /> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
<tr> <tal:block define="name string:kvm">
<td colspan="3"><b> Set URL for the software release </b></td> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/set_software_for_parameter_test" />
</tr> </tal:block>
<tr>
<td>type</td>
<td>//input[@name='url_string']</td>
<td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.289/software/kvm/software.cfg</td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>//textarea[@name='parameter_output']</td> <td>//textarea[@name='parameter_output']</td>
......
...@@ -14,20 +14,15 @@ ...@@ -14,20 +14,15 @@
</thead> </thead>
<tbody> <tbody>
<tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" /> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
<tr> <tal:block define="name string:theia">
<td colspan="3"><b> Set URL for the software release </b></td> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/set_software_for_parameter_test" />
</tr> </tal:block>
<tr>
<td>type</td>
<td>//input[@name='url_string']</td>
<td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.289/software/theia/software.cfg</td>
</tr>
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" /> <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
<tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/wait_software_type_selection_default" /> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/wait_software_type_selection_default" />
<tr> <tr>
<td colspan="3"><b> Fill the ram size</b></td> <td colspan="3"><b> Set autorun</b></td>
</tr> </tr>
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
......
...@@ -14,14 +14,9 @@ ...@@ -14,14 +14,9 @@
</thead> </thead>
<tbody> <tbody>
<tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" /> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
<tr> <tal:block define="name string:theia">
<td colspan="3"><b> Set URL for the software release </b></td> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/set_software_for_parameter_test" />
</tr> </tal:block>
<tr>
<td>type</td>
<td>//input[@name='url_string']</td>
<td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.289/software/theia/software.cfg</td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>//textarea[@name='parameter_output']</td> <td>//textarea[@name='parameter_output']</td>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="_reconstructor" module="copy_reg"/>
</klass>
<tuple>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ERP5Site_getSoftwareReleaseTagVersion</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
# PreferenceTool # PreferenceTool
from DateTime import DateTime from DateTime import DateTime
software_version = "1.0.289" software_version = context.ERP5Site_getSoftwareReleaseTagVersion()
portal = context.getPortalObject() portal = context.getPortalObject()
...@@ -82,7 +82,41 @@ theia_software_release.edit( ...@@ -82,7 +82,41 @@ theia_software_release.edit(
if theia_software_release.getValidationState() == "draft": if theia_software_release.getValidationState() == "draft":
theia_software_release.publishAlive() theia_software_release.publishAlive()
portal = context.getPortalObject()
try:
erp5_product = context.software_product_module["erp5"]
except KeyError:
erp5_product = context.software_product_module.newContent(
id="erp5",
title="ERP5",
product_line ="software/application",
reference="erp5",
portal_type="Software Product"
)
if erp5_product.getValidationState() == "draft":
erp5_product.publish()
try:
erp5_software_release = context.software_release_module["erp5"]
except KeyError:
erp5_software_release = context.software_release_module.newContent(
id="erp5",
title="ERP5",
portal_type="Software Release",
version="0.1",
language="en",
effective_date=DateTime('2018/03/14 00:00:00 UTC'),
aggregate="software_product_module/erp5"
)
erp5_software_release.edit(
url_string="https://lab.nexedi.com/nexedi/slapos/raw/%s/software/erp5/software.cfg" % software_version,
)
if erp5_software_release.getValidationState() == "draft":
erp5_software_release.publishAlive()
# some are already indexed # some are already indexed
kw = {'portal_type': ('Authentication Event', 'Passoword Event')} kw = {'portal_type': ('Authentication Event', 'Passoword Event')}
......
...@@ -337,12 +337,11 @@ ...@@ -337,12 +337,11 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>//input[@name='url_string']</td> <td>//input[@name='url_string']</td>
<td tal:content="python: 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.327/software/ors-amarisoft/software-%s.cfg' % name"></td> <td tal:content="python: 'https://lab.nexedi.com/nexedi/slapos/raw/%s/software/ors-amarisoft/software-%s.cfg' % (context.ERP5Site_getSoftwareReleaseTagVersion(), name)"></td>
<td></td> <td></td>
</tr> </tr>
</tal:block> </tal:block>
<tal:block metal:define-macro="basic_core_network_scenario"> <tal:block metal:define-macro="basic_core_network_scenario">
<tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/wait_software_type_selection" /> <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/wait_software_type_selection" />
<tr> <tr>
......
...@@ -283,4 +283,16 @@ ...@@ -283,4 +283,16 @@
<td tal:content="python: value"></td> <td tal:content="python: value"></td>
</tr> </tr>
</tal:block> </tal:block>
<tal:block metal:define-macro="set_software_for_parameter_test">
<tr>
<td colspan="3"><b> Set URL for the software release </b></td>
</tr>
<tr>
<td>type</td>
<td>//input[@name='url_string']</td>
<td tal:content="python: 'https://lab.nexedi.com/nexedi/slapos/raw/%s/software/%s/software.cfg' % (context.ERP5Site_getSoftwareReleaseTagVersion(), name)"></td>
</tr>
</tal:block>
</tal:block> </tal:block>
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment