diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2020-03-04 11:32:08 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-03-04 11:32:08 +0100 |
| commit | b473faae865f62f50c8c8059e6ebee907d7c6aa6 (patch) | |
| tree | 247503dcdebb14c730a6fba7f59620d00d6b9948 | |
| parent | fef549d5bf6b15bd0be8d6ee0d7e7fdc43f99c62 (diff) | |
| parent | 9700dfcb1c68079c2a5aeb7dc1167bc21bb50c30 (diff) | |
Merge pull request #114 from montjoie/update-to-2020.02
Update LAVA to 2020.02
| -rw-r--r-- | lava-master/Dockerfile | 2 | ||||
| -rw-r--r-- | lava-master/lava-patch/0001-scheduler.jobs.show-fix-missing-value-after-2019.09.patch | 25 | ||||
| -rw-r--r-- | lava-slave/Dockerfile | 2 |
3 files changed, 2 insertions, 27 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 76c3425..5b99ac5 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -1,4 +1,4 @@ -FROM lavasoftware/lava-server:2019.09 +FROM lavasoftware/lava-server:2020.02 RUN apt-get update && apt-get -y install sudo lava-coordinator git diff --git a/lava-master/lava-patch/0001-scheduler.jobs.show-fix-missing-value-after-2019.09.patch b/lava-master/lava-patch/0001-scheduler.jobs.show-fix-missing-value-after-2019.09.patch deleted file mode 100644 index 093996d..0000000 --- a/lava-master/lava-patch/0001-scheduler.jobs.show-fix-missing-value-after-2019.09.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/lava_scheduler_app/api/jobs.py b/lava_scheduler_app/api/jobs.py -index 7c9e2cd52..5aba8d88b 100644 ---- a/lava_scheduler_app/api/jobs.py -+++ b/lava_scheduler_app/api/jobs.py -@@ -395,6 +395,12 @@ class SchedulerJobsAPI(ExposedV2API): - device_type = None - if job.requested_device_type is not None: - device_type = job.requested_device_type.name -+ if job.is_public: -+ visibility = "Public" -+ else: -+ visibility = "Private (%s)" % ", ".join( -+ [g.name for g in job.viewing_groups.all()] -+ ) - - return { - "id": job.display_id, -@@ -410,6 +416,7 @@ class SchedulerJobsAPI(ExposedV2API): - "start_time": job.start_time, - "end_time": job.end_time, - "tags": [t.name for t in job.tags.all()], -+ "visibility": visibility, - "failure_comment": job.failure_comment, - } - diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index b16da41..bf908f9 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -1,4 +1,4 @@ -FROM lavasoftware/lava-dispatcher:2019.09 +FROM lavasoftware/lava-dispatcher:2020.02 RUN apt-get update |