Commit a01eb331 authored by Łukasz Nowak's avatar Łukasz Nowak

slapos_jio: Support Software Releases with ?

For technical reasons the ? for Software Release allows simple hacky multiple
software releases to be created, which share exactly the same profile code,
and so JSON Schemas. So for such, use original Software Release JSON Schemas.
parent c8c036f3
Pipeline #15420 failed with stage
in 0 seconds
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
var doc = result[1], var doc = result[1],
parameter_dict = { parameter_dict = {
'parameter' : { 'parameter' : {
'json_url': doc.url_string + ".json", 'json_url': doc.url_string.split('?')[0] + ".json",
//'json_url': "https://lab.node.vifib.com/nexedi/slapos/raw/master/software/kvm/software.cfg.json", //'json_url': "https://lab.node.vifib.com/nexedi/slapos/raw/master/software/kvm/software.cfg.json",
'parameter_hash': btoa('<?xml version="1.0" encoding="utf-8" ?><instance></instance>'), 'parameter_hash': btoa('<?xml version="1.0" encoding="utf-8" ?><instance></instance>'),
'restricted_softwaretype': false 'restricted_softwaretype': false
......
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
], ],
parameter_dict = { parameter_dict = {
'parameter' : { 'parameter' : {
'json_url': gadget.state.doc.url_string + ".json", 'json_url': gadget.state.doc.url_string.split('?')[0] + ".json",
'softwaretype': gadget.state.doc.source_reference, 'softwaretype': gadget.state.doc.source_reference,
'shared': gadget.state.doc.root_slave ? 1 : 0, 'shared': gadget.state.doc.root_slave ? 1 : 0,
//'json_url': "https://lab.node.vifib.com/nexedi/slapos/raw/master/software/kvm/software.cfg.json", //'json_url': "https://lab.node.vifib.com/nexedi/slapos/raw/master/software/kvm/software.cfg.json",
......
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