Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qa-report-app
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
infrastructure
qa-report-app
Commits
49e7918d
Commit
49e7918d
authored
Jul 12, 2019
by
Emanuele Aina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split the tiny-lxc results to their own separate report page
Signed-off-by:
Emanuele Aina
<
emanuele.aina@collabora.com
>
parent
937de0f1
Pipeline
#4198
passed with stage
in 1 minute and 25 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
8 deletions
+50
-8
migrations/versions/b34966f3a758_change_lxc_tiny_deployment_type_from_apt-to-lxc.py
...f3a758_change_lxc_tiny_deployment_type_from_apt-to-lxc.py
+33
-0
templates/report.html
templates/report.html
+12
-6
testobjects.py
testobjects.py
+3
-0
tests/testobjects_test.py
tests/testobjects_test.py
+2
-2
No files found.
migrations/versions/b34966f3a758_change_lxc_tiny_deployment_type_from_apt-to-lxc.py
0 → 100644
View file @
49e7918d
"""Change lxc-tiny deployment type from 'apt' to 'lxc'
Revision ID: b34966f3a758
Revises: 6951d2025d13
Create Date: 2019-07-12 06:41:56.750351
"""
from
alembic
import
op
import
sqlalchemy
as
sa
# revision identifiers, used by Alembic.
revision
=
'b34966f3a758'
down_revision
=
'6951d2025d13'
branch_labels
=
None
depends_on
=
None
def
upgrade
():
connection
=
op
.
get_bind
()
connection
.
execute
(
"""
UPDATE jobs
SET image_deployment = 'lxc'
WHERE image_type = 'tiny-lxc'
"""
)
def
downgrade
():
connection
=
op
.
get_bind
()
connection
.
execute
(
"""
UPDATE jobs
SET image_deployment = 'apt'
WHERE image_type = 'tiny-lxc'
"""
)
templates/report.html
View file @
49e7918d
...
...
@@ -39,6 +39,10 @@
{{ set_image_url('Nfsroot ARM', image_urls['nfs-armhf-public']) }} ,
{{ set_image_url('Nfsroot ARM64', image_urls['nfs-arm64-public']) }} ,
{{ set_image_url('Nfsroot AMD64', image_urls['nfs-amd64-public']) }}
{% elif image_deployment == 'lxc' %}
{{ set_image_url('Tiny LXC ARM', image_urls['tiny-lxc-armhf-public']) }} ,
{{ set_image_url('Tiny LXC ARM64', image_urls['tiny-lxc-arm64-public']) }} ,
{{ set_image_url('Tiny LXC AMD64', image_urls['tiny-lxc-amd64-public']) }}
{% else %}
{{ set_image_url('Minimal ARM', image_urls['minimal-armhf-public']) }},
{{ set_image_url('Minimal ARM64', image_urls['minimal-arm64-public']) }},
...
...
@@ -65,6 +69,10 @@
<th
scope=
"col"
>
Nfsroot ARM
</th>
<th
scope=
"col"
>
Nfsroot ARM64
</th>
<th
scope=
"col"
>
Nfsroot AMD64
</th>
{% elif image_deployment == 'lxc' %}
<th
scope=
"col"
>
Tiny ARM
</th>
<th
scope=
"col"
>
Tiny ARM64
</th>
<th
scope=
"col"
>
Tiny AMD64
</th>
{% else %}
<th
scope=
"col"
>
Minimal ARM (internal)
</th>
<th
scope=
"col"
>
Minimal ARM
</th>
...
...
@@ -75,9 +83,6 @@
{% if image_deployment != 'ostree' %}
<th
scope=
"col"
>
Base SDK AMD64
</th>
<th
scope=
"col"
>
SDK AMD64
</th>
<th
scope=
"col"
>
Tiny ARM
</th>
<th
scope=
"col"
>
Tiny ARM64
</th>
<th
scope=
"col"
>
Tiny AMD64
</th>
{% endif %}
{% endif %}
<th
scope=
"col"
>
Notes
</th>
...
...
@@ -91,6 +96,10 @@
{{ set_cell('nfsroot-armhf-public', image_types) }}
{{ set_cell('nfsroot-arm64-public', image_types) }}
{{ set_cell('nfsroot-amd64-public', image_types) }}
{% elif image_deployment == 'lxc' %}
{{ set_cell('tiny-lxc-armhf-public', image_types) }}
{{ set_cell('tiny-lxc-arm64-public', image_types) }}
{{ set_cell('tiny-lxc-amd64-public', image_types) }}
{% else %}
{{ set_cell('minimal-armhf-internal', image_types) }}
{{ set_cell('minimal-armhf-public', image_types) }}
...
...
@@ -101,9 +110,6 @@
{% if image_deployment != 'ostree' %}
{{ set_cell('basesdk-amd64-public', image_types) }}
{{ set_cell('sdk-amd64-public', image_types) }}
{{ set_cell('tiny-lxc-armhf-public', image_types) }}
{{ set_cell('tiny-lxc-arm64-public', image_types) }}
{{ set_cell('tiny-lxc-amd64-public', image_types) }}
{% endif %}
{% endif %}
<td
style=
"min-width: 300px;"
>
{{ notes }}
</td>
...
...
testobjects.py
View file @
49e7918d
...
...
@@ -76,6 +76,9 @@ def lava_jobdata_extract_definition(data):
elif
'nfs'
in
image_url
:
ret
[
'image.deployment'
]
=
'nfs'
ret
[
'image.flavour'
]
=
'nfs'
elif
definition
[
'metadata'
][
'image.type'
]
==
'tiny-lxc'
:
ret
[
'image.deployment'
]
=
'lxc'
ret
[
'image.flavour'
]
=
'tiny'
ret
.
update
(
definition
[
'metadata'
])
...
...
tests/testobjects_test.py
View file @
49e7918d
...
...
@@ -194,8 +194,8 @@ def test_load_1699255():
with
open_relative
(
'./test_data/job_data_1699255'
)
as
f
:
rawdata
=
json
.
load
(
f
)
t
=
TestJob
(
rawdata
)
#
assert t.metadata['image.deployment'] == 'lxc'
#
assert t.metadata['image.flavour'] == 'tiny'
assert
t
.
metadata
[
'image.deployment'
]
==
'lxc'
assert
t
.
metadata
[
'image.flavour'
]
==
'tiny'
assert
list
(
sorted
(
t
.
results
.
keys
()))
==
[
'tiny-container-system-aa-enforcement'
,
'tiny-container-system-basic'
,
...
...
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