Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
6fbc6e15
Commit
6fbc6e15
authored
Nov 29, 2019
by
Thomas Gambier
🚴🏼
Committed by
Łukasz Nowak
Nov 29, 2019
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix publishing of custom-frontend-url
parent
c85e3b0c
Pipeline
#6885
failed with stage
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-1
software/slaprunner/test/test.py
software/slaprunner/test/test.py
+15
-0
No files found.
software/slaprunner/buildout.hash.cfg
View file @
6fbc6e15
...
@@ -18,7 +18,7 @@ md5sum = 8b78e32b877d591400746ec7fd68ed4c
...
@@ -18,7 +18,7 @@ md5sum = 8b78e32b877d591400746ec7fd68ed4c
[template-runner]
[template-runner]
filename = instance-runner.cfg
filename = instance-runner.cfg
md5sum = 8
5ea0b78fd18428c242438ebe95f980b
md5sum = 8
7545b1f9f3865c8cb1347edeb340678
[template-runner-import-script]
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
filename = template/runner-import.sh.jinja2
...
...
software/slaprunner/instance-runner.cfg
View file @
6fbc6e15
...
@@ -115,7 +115,7 @@ name = custom_frontend_ready_promise.py
...
@@ -115,7 +115,7 @@ name = custom_frontend_ready_promise.py
config-command = $${custom-frontend-url-ready-promise-bin:rendered}
config-command = $${custom-frontend-url-ready-promise-bin:rendered}
[publish-connection-information]
[publish-connection-information]
custom-frontend-url = $${custom-frontend-url-ready-promise:url}
custom-frontend-url = $${custom-frontend-url-ready-promise
-bin
:url}
{% endif %}
{% endif %}
# Create all needed directories
# Create all needed directories
...
...
software/slaprunner/test/test.py
View file @
6fbc6e15
...
@@ -297,3 +297,18 @@ class TestInstanceResilient(SlaprunnerTestCase):
...
@@ -297,3 +297,18 @@ class TestInstanceResilient(SlaprunnerTestCase):
'takeover-runner-1-url'
,
'takeover-runner-1-url'
,
'url'
,
'url'
,
'webdav-url'
]))
'webdav-url'
]))
class
TestCustomFrontend
(
SlaprunnerTestCase
):
@
classmethod
def
getInstanceParameterDict
(
cls
):
return
{
'custom-frontend-backend-url'
:
'https://www.erp5.com'
,
'custom-frontend-backend-type'
:
'redirect'
,
}
def
test
(
self
):
parameter_dict
=
self
.
computer_partition
.
getConnectionParameterDict
()
self
.
assertEqual
(
parameter_dict
[
'custom-frontend-url'
],
'https://www.erp5.com'
)
Thomas Gambier
🚴🏼
@tomo
mentioned in merge request
!777 (merged)
·
Jun 25, 2020
mentioned in merge request
!777 (merged)
mentioned in merge request !777
Toggle commit list
Thomas Gambier
🚴🏼
@tomo
mentioned in commit
c8382bce
·
Aug 03, 2020
mentioned in commit
c8382bce
mentioned in commit c8382bceba1f4c9e504ea951456da924d278c58a
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment