Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Gepetto
dashboard
Commits
26564b20
Commit
26564b20
authored
Feb 26, 2019
by
Guilhem Saurel
Browse files
Revert "build args: add CATEGORY"
This reverts commit
c94cdc5f
.
parent
c94cdc5f
Pipeline
#3060
passed with stages
in 5 minutes and 53 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
rainboard/models.py
View file @
26564b20
...
...
@@ -13,8 +13,9 @@ from django.utils import timezone
from
django.utils.dateparse
import
parse_datetime
from
django.utils.safestring
import
mark_safe
import
git
import
requests
import
git
from
autoslug
import
AutoSlugField
from
ndh.models
import
Links
,
NamedModel
,
TimeStampedModel
from
ndh.utils
import
enum_to_choices
,
query_sum
...
...
@@ -770,12 +771,7 @@ class Image(models.Model):
return
f
'
{
self
.
robotpkg
}{
py
}
:
{
self
.
target
}
'
def
get_build_args
(
self
):
ret
=
{
'TARGET'
:
self
.
target
,
'ROBOTPKG'
:
self
.
robotpkg
,
'REGISTRY'
:
self
.
robotpkg
.
project
.
registry
(),
'CATEGORY'
:
self
.
robotpkg
.
category
,
}
ret
=
{
'TARGET'
:
self
.
target
,
'ROBOTPKG'
:
self
.
robotpkg
,
'REGISTRY'
:
self
.
robotpkg
.
project
.
registry
()}
if
not
self
.
robotpkg
.
project
.
public
:
ret
[
'IMAGE'
]
=
'robotpkg-jrl-py3'
if
self
.
py3
else
'robotpkg-jrl'
elif
self
.
py3
:
...
...
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