Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
main
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Simone Rossi
main
Commits
8ca74616
Commit
8ca74616
authored
Aug 30, 2018
by
Daniele Venzano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
parent
111bdaa5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
integration_tests/sample_docker.conf
integration_tests/sample_docker.conf
+2
-2
zoe_api/web/zapp_shop.py
zoe_api/web/zapp_shop.py
+2
-2
No files found.
integration_tests/sample_docker.conf
View file @
8ca74616
...
...
@@ -5,5 +5,5 @@ tls_key: /certs/key.pem
tls_ca
: /
certs
/
ca
.
pem
[
gitlab
-
builder
]
docker_address
:
192
.
168
.
4
5
.
4
:
2375
external_address
:
192
.
168
.
4
5
.
4
docker_address
:
192
.
168
.
4
7
.
12
:
2375
external_address
:
192
.
168
.
4
7
.
12
zoe_api/web/zapp_shop.py
View file @
8ca74616
...
...
@@ -96,7 +96,7 @@ class ZAppStartWeb(ZoeWebRequestHandler):
exec_name
=
self
.
get_argument
(
'exec_name'
)
if
self
.
current_user
.
role
.
can_customize_resources
:
app_descr
=
self
.
_set_parameters
(
zapp
.
zoe_description
,
zapp
.
parameters
,
self
.
current_user
.
role
)
app_descr
=
self
.
_set_parameters
(
zapp
.
zoe_description
,
zapp
.
parameters
)
else
:
app_descr
=
zapp
.
zoe_description
...
...
@@ -123,7 +123,7 @@ class ZAppStartWeb(ZoeWebRequestHandler):
self
.
redirect
(
self
.
reverse_url
(
'execution_inspect'
,
new_id
))
def
_set_parameters
(
self
,
app_descr
,
params
,
role
):
def
_set_parameters
(
self
,
app_descr
,
params
):
for
param
in
params
:
argument_name
=
param
.
name
+
'-'
+
param
.
kind
if
param
.
kind
==
'environment'
:
...
...
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