[ARVADOS] updated: 2.1.0-219-ga800bc4f9
Git user
git at public.arvados.org
Tue Dec 15 17:31:22 UTC 2020
Summary of changes:
lib/controller/forecast/controller_test.go | 8 +-
.../forecast/test-fixtures/hasher1_data.golden | 2 +-
.../forecast/test-fixtures/hasher2_data.golden | 2 +-
.../forecast/test-fixtures/hasher3_data.golden | 2 +-
sdk/go/arvadostest/fixtures.go | 9 -
services/api/test/fixtures/container_requests.yml | 226 ---------------------
6 files changed, 7 insertions(+), 242 deletions(-)
via a800bc4f9b2aad77cf6ef9c81ac108ed14489a7e (commit)
from d0b6442436c58f0ce78a1bb2497f2ec316b10e63 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit a800bc4f9b2aad77cf6ef9c81ac108ed14489a7e
Author: Nico Cesar <nico at nicocesar.com>
Date: Tue Dec 15 12:30:58 2020 -0500
Addapted test with data that was already there
Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>
diff --git a/lib/controller/forecast/controller_test.go b/lib/controller/forecast/controller_test.go
index 7b45fe54c..6a85e8788 100644
--- a/lib/controller/forecast/controller_test.go
+++ b/lib/controller/forecast/controller_test.go
@@ -80,9 +80,9 @@ func (s *ForecastSuite) TearDownTest(c *check.C) {
func (s *ForecastSuite) TestDatapoints(c *check.C) {
// Just as basic test to make sure the datapoints endpoint is there and giving out some data
- // HasherRootUUID (zzzzz-xvhdp-p1i7h1gy5z1ft4p) is hasher_root from services/api/test/fixtures/container_requests.yml
+ // CompletedDiagnosticsContainerRequest1UUID (zzzzz-xvhdp-p1i7h1gy5z1ft4p) is hasher_root from services/api/test/fixtures/container_requests.yml
// this container request start all the
- resp, err := s.ctrl.ForecastDatapoints(s.ctx, arvados.GetOptions{UUID: arvadostest.HasherRootUUID})
+ resp, err := s.ctrl.ForecastDatapoints(s.ctx, arvados.GetOptions{UUID: arvadostest.CompletedDiagnosticsContainerRequest1UUID})
c.Check(err, check.IsNil)
c.Check(len(resp.Datapoints), check.Equals, 3)
}
@@ -99,7 +99,7 @@ func (s *ForecastSuite) TestDatapointsValues(c *check.C) {
{"hasher2_data", "hasher2"},
{"hasher3_data", "hasher3"},
}
- resp, err := s.ctrl.ForecastDatapoints(s.ctx, arvados.GetOptions{UUID: arvadostest.HasherRootUUID})
+ resp, err := s.ctrl.ForecastDatapoints(s.ctx, arvados.GetOptions{UUID: arvadostest.CompletedDiagnosticsContainerRequest1UUID})
c.Check(err, check.IsNil)
for _, tc := range cases {
@@ -123,6 +123,6 @@ func (s *ForecastSuite) TestDatapointsValues(c *check.C) {
expected, err := ioutil.ReadFile(golden)
c.Check(err, check.IsNil)
- c.Check(actualBytes, check.DeepEquals, expected)
+ c.Check(string(actualBytes), check.Equals, string(expected))
}
}
diff --git a/lib/controller/forecast/test-fixtures/hasher1_data.golden b/lib/controller/forecast/test-fixtures/hasher1_data.golden
index 8dae64618..9835aa0e8 100644
--- a/lib/controller/forecast/test-fixtures/hasher1_data.golden
+++ b/lib/controller/forecast/test-fixtures/hasher1_data.golden
@@ -1 +1 @@
-{"checkpoint":"hasher1","start_1":"2020-09-28 15:04:38.079 +0000","end_1":"2020-09-28 15:04:40.708 +0000","start_2":"2020-09-28 15:04:40.364 +0000","end_2":"2020-09-28 15:04:40.708 +0000","reuse":false,"legend":"\u003cp\u003ehasher1\u003c/p\u003e\u003cp\u003eContainer Request: \u003ca href=\"https://workbench.x2bo2.arvadosapi.com/container_requests/zzzzz-xvhdp-et5v1vofm3109fn\"\u003ezzzzz-xvhdp-et5v1vofm3109fn\u003c/a\u003e\u003c/p\u003e\u003cp\u003eContainer duration: 343.564ms\n\u003c/p\u003e"}
\ No newline at end of file
+{"checkpoint":"hasher1","start_1":"2020-11-02 00:03:50.229 +0000","end_1":"2020-11-02 00:16:55.105 +0000","start_2":"2020-11-02 00:16:52.375 +0000","end_2":"2020-11-02 00:16:55.105 +0000","reuse":false,"legend":"\u003cp\u003ehasher1\u003c/p\u003e\u003cp\u003eContainer Request: zzzzz-xvhdp-diag1hasher0001\u003c/a\u003e\u003c/p\u003e\u003cp\u003eContainer duration: 2.730114s\n\u003c/p\u003e"}
\ No newline at end of file
diff --git a/lib/controller/forecast/test-fixtures/hasher2_data.golden b/lib/controller/forecast/test-fixtures/hasher2_data.golden
index a2b1c62c2..2801efe9c 100644
--- a/lib/controller/forecast/test-fixtures/hasher2_data.golden
+++ b/lib/controller/forecast/test-fixtures/hasher2_data.golden
@@ -1 +1 @@
-{"checkpoint":"hasher2","start_1":"2020-09-28 15:04:50.144 +0000","end_1":"2020-09-28 15:04:52.783 +0000","start_2":"2020-09-28 15:04:52.463 +0000","end_2":"2020-09-28 15:04:52.783 +0000","reuse":false,"legend":"\u003cp\u003ehasher2\u003c/p\u003e\u003cp\u003eContainer Request: \u003ca href=\"https://workbench.x2bo2.arvadosapi.com/container_requests/zzzzz-xvhdp-k2i0vu6n1ebsyvo\"\u003ezzzzz-xvhdp-k2i0vu6n1ebsyvo\u003c/a\u003e\u003c/p\u003e\u003cp\u003eContainer duration: 319.663ms\n\u003c/p\u003e"}
\ No newline at end of file
+{"checkpoint":"hasher2","start_1":"2020-11-02 00:17:07.067 +0000","end_1":"2020-11-02 00:20:23.478 +0000","start_2":"2020-11-02 00:20:21.513 +0000","end_2":"2020-11-02 00:20:23.478 +0000","reuse":false,"legend":"\u003cp\u003ehasher2\u003c/p\u003e\u003cp\u003eContainer Request: zzzzz-xvhdp-diag1hasher0002\u003c/a\u003e\u003c/p\u003e\u003cp\u003eContainer duration: 1.965132s\n\u003c/p\u003e"}
\ No newline at end of file
diff --git a/lib/controller/forecast/test-fixtures/hasher3_data.golden b/lib/controller/forecast/test-fixtures/hasher3_data.golden
index 42941eb4f..d2cb460ed 100644
--- a/lib/controller/forecast/test-fixtures/hasher3_data.golden
+++ b/lib/controller/forecast/test-fixtures/hasher3_data.golden
@@ -1 +1 @@
-{"checkpoint":"hasher3","start_1":"2020-09-28 15:05:02.111 +0000","end_1":"2020-09-28 15:05:04.783 +0000","start_2":"2020-09-28 15:05:04.490 +0000","end_2":"2020-09-28 15:05:04.783 +0000","reuse":false,"legend":"\u003cp\u003ehasher3\u003c/p\u003e\u003cp\u003eContainer Request: \u003ca href=\"https://workbench.x2bo2.arvadosapi.com/container_requests/zzzzz-xvhdp-37vzxz1l2k2ywvd\"\u003ezzzzz-xvhdp-37vzxz1l2k2ywvd\u003c/a\u003e\u003c/p\u003e\u003cp\u003eContainer duration: 293.211ms\n\u003c/p\u003e"}
\ No newline at end of file
+{"checkpoint":"hasher3","start_1":"2020-11-02 00:20:30.960 +0000","end_1":"2020-11-02 00:20:38.732 +0000","start_2":"2020-11-02 00:20:36.748 +0000","end_2":"2020-11-02 00:20:38.732 +0000","reuse":false,"legend":"\u003cp\u003ehasher3\u003c/p\u003e\u003cp\u003eContainer Request: zzzzz-xvhdp-diag1hasher0003\u003c/a\u003e\u003c/p\u003e\u003cp\u003eContainer duration: 1.983242s\n\u003c/p\u003e"}
\ No newline at end of file
diff --git a/sdk/go/arvadostest/fixtures.go b/sdk/go/arvadostest/fixtures.go
index fd7bef5ca..aeb5a47e6 100644
--- a/sdk/go/arvadostest/fixtures.go
+++ b/sdk/go/arvadostest/fixtures.go
@@ -66,15 +66,6 @@ const (
Hasher2LogCollectionUUID = "zzzzz-4zz18-dlogcollhash002"
Hasher3LogCollectionUUID = "zzzzz-4zz18-dlogcollhash003"
- HasherRootUUID = "zzzzz-xvhdp-p1i7h1gy5z1ft4p"
- HasherRootContainerUUID = "zzzzz-dz642-gxfj5yt5x6x6nr2"
- HasherHasher1UUID = "zzzzz-xvhdp-et5v1vofm3109fn"
- HasherHasher1ContainerUUID = "zzzzz-dz642-1wfe84lcxvojijy"
- HasherHasher2UUID = "zzzzz-xvhdp-k2i0vu6n1ebsyvo"
- HasherHasher2ContainerUUID = "zzzzz-dz642-80yksfp68lxz3gs"
- HasherHasher3UUID = "zzzzz-xvhdp-37vzxz1l2k2ywvd"
- HasherHasher3ContainerUUID = "zzzzz-dz642-xzw7j59tkq7u8pe"
-
ArvadosRepoUUID = "zzzzz-s0uqq-arvadosrepo0123"
ArvadosRepoName = "arvados"
FooRepoUUID = "zzzzz-s0uqq-382brsig8rp3666"
diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index d96514271..1c6260502 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -353,232 +353,6 @@ completed_diagnostics_hasher3_reuse:
ram: 2684354560
API: true
-completed_diagnostics:
- name: CWL diagnostics hasher
- uuid: zzzzz-xvhdp-diagnostics0001
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Final
- priority: 1
- created_at: 2020-11-02T00:03:50.229364000Z
- modified_at: 2020-11-02T00:20:44.041122000Z
- modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- container_image: d967ef4a1ca90a096a39f5ce68e4a2e7+261
- cwd: /var/spool/cwl
- output_path: /var/spool/cwl
- command: [
- "arvados-cwl-runner",
- "--local",
- "--api=containers",
- "--no-log-timestamps",
- "--disable-validate",
- "--disable-color",
- "--eval-timeout=20",
- "--thread-count=1",
- "--disable-reuse",
- "--collection-cache-size=256",
- "--on-error=continue",
- "/var/lib/cwl/workflow.json#main",
- "/var/lib/cwl/cwl.input.json"
- ]
- container_uuid: zzzzz-dz642-diagcompreq0001
- log_uuid: zzzzz-4zz18-diagcompreqlog1
- output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
- runtime_constraints:
- vcpus: 1
- ram: 1342177280
- API: true
-
-completed_diagnostics_hasher1:
- name: hasher1
- uuid: zzzzz-xvhdp-diag1hasher0001
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Final
- priority: 500
- created_at: 2020-11-02T00:03:50.229364000Z
- modified_at: 2020-11-02T00:20:44.041122000Z
- modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- container_image: d967ef4a1ca90a096a39f5ce68e4a2e7+261
- cwd: /var/spool/cwl
- output_name: Output for step hasher1
- output_path: /var/spool/cwl
- command: [
- "md5sum",
- "/keep/9f26a86b6030a69ad222cf67d71c9502+65/hasher-input-file.txt"
- ]
- container_uuid: zzzzz-dz642-diagcomphasher1
- requesting_container_uuid: zzzzz-dz642-diagcompreq0001
- log_uuid: zzzzz-4zz18-dlogcollhash001
- output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
- runtime_constraints:
- vcpus: 1
- ram: 2684354560
- API: true
-
-completed_diagnostics_hasher2:
- name: hasher2
- uuid: zzzzz-xvhdp-diag1hasher0002
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Final
- priority: 500
- created_at: 2020-11-02T00:17:07.067464000Z
- modified_at: 2020-11-02T00:20:23.557498000Z
- modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- container_image: d967ef4a1ca90a096a39f5ce68e4a2e7+261
- cwd: /var/spool/cwl
- output_name: Output for step hasher2
- output_path: /var/spool/cwl
- command: [
- "md5sum",
- "/keep/d3a687732e84061f3bae15dc7e313483+62/hasher1.md5sum.txt"
- ]
- container_uuid: zzzzz-dz642-diagcomphasher2
- requesting_container_uuid: zzzzz-dz642-diagcompreq0001
- log_uuid: zzzzz-4zz18-dlogcollhash002
- output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
- runtime_constraints:
- vcpus: 2
- ram: 2684354560
- API: true
-
-completed_diagnostics_hasher3:
- name: hasher3
- uuid: zzzzz-xvhdp-diag1hasher0003
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Final
- priority: 500
- created_at: 2020-11-02T00:20:30.960251000Z
- modified_at: 2020-11-02T00:20:38.799377000Z
- modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- container_image: d967ef4a1ca90a096a39f5ce68e4a2e7+261
- cwd: /var/spool/cwl
- output_name: Output for step hasher3
- output_path: /var/spool/cwl
- command: [
- "md5sum",
- "/keep/6bd770f6cf8f83e7647c602eecfaeeb8+62/hasher2.md5sum.txt"
- ]
- container_uuid: zzzzz-dz642-diagcomphasher3
- requesting_container_uuid: zzzzz-dz642-diagcompreq0001
- log_uuid: zzzzz-4zz18-dlogcollhash003
- output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
- runtime_constraints:
- vcpus: 1
- ram: 2684354560
- API: true
-
-completed_diagnostics2:
- name: Copy of CWL diagnostics hasher
- uuid: zzzzz-xvhdp-diagnostics0002
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Final
- priority: 1
- created_at: 2020-11-03T15:54:30.098485000Z
- modified_at: 2020-11-03T16:17:53.406809000Z
- modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- container_image: d967ef4a1ca90a096a39f5ce68e4a2e7+261
- cwd: /var/spool/cwl
- output_path: /var/spool/cwl
- command: [
- "arvados-cwl-runner",
- "--local",
- "--api=containers",
- "--no-log-timestamps",
- "--disable-validate",
- "--disable-color",
- "--eval-timeout=20",
- "--thread-count=1",
- "--disable-reuse",
- "--collection-cache-size=256",
- "--on-error=continue",
- "/var/lib/cwl/workflow.json#main",
- "/var/lib/cwl/cwl.input.json"
- ]
- container_uuid: zzzzz-dz642-diagcompreq0002
- log_uuid: zzzzz-4zz18-diagcompreqlog2
- output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
- runtime_constraints:
- vcpus: 1
- ram: 1342177280
- API: true
-
-completed_diagnostics_hasher1_reuse:
- name: hasher1
- uuid: zzzzz-xvhdp-diag2hasher0001
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Final
- priority: 500
- created_at: 2020-11-02T00:03:50.229364000Z
- modified_at: 2020-11-02T00:20:44.041122000Z
- modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- container_image: d967ef4a1ca90a096a39f5ce68e4a2e7+261
- cwd: /var/spool/cwl
- output_name: Output for step hasher1
- output_path: /var/spool/cwl
- command: [
- "md5sum",
- "/keep/9f26a86b6030a69ad222cf67d71c9502+65/hasher-input-file.txt"
- ]
- container_uuid: zzzzz-dz642-diagcomphasher1
- requesting_container_uuid: zzzzz-dz642-diagcompreq0002
- log_uuid: zzzzz-4zz18-dlogcollhash001
- output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
- runtime_constraints:
- vcpus: 1
- ram: 2684354560
- API: true
-
-completed_diagnostics_hasher2_reuse:
- name: hasher2
- uuid: zzzzz-xvhdp-diag2hasher0002
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Final
- priority: 500
- created_at: 2020-11-02T00:17:07.067464000Z
- modified_at: 2020-11-02T00:20:23.557498000Z
- modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- container_image: d967ef4a1ca90a096a39f5ce68e4a2e7+261
- cwd: /var/spool/cwl
- output_name: Output for step hasher2
- output_path: /var/spool/cwl
- command: [
- "md5sum",
- "/keep/d3a687732e84061f3bae15dc7e313483+62/hasher1.md5sum.txt"
- ]
- container_uuid: zzzzz-dz642-diagcomphasher2
- requesting_container_uuid: zzzzz-dz642-diagcompreq0002
- log_uuid: zzzzz-4zz18-dlogcollhash002
- output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
- runtime_constraints:
- vcpus: 2
- ram: 2684354560
- API: true
-
-completed_diagnostics_hasher3_reuse:
- name: hasher3
- uuid: zzzzz-xvhdp-diag2hasher0003
- owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- state: Final
- priority: 500
- created_at: 2020-11-02T00:20:30.960251000Z
- modified_at: 2020-11-02T00:20:38.799377000Z
- modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- container_image: d967ef4a1ca90a096a39f5ce68e4a2e7+261
- cwd: /var/spool/cwl
- output_name: Output for step hasher3
- output_path: /var/spool/cwl
- command: [
- "md5sum",
- "/keep/6bd770f6cf8f83e7647c602eecfaeeb8+62/hasher2.md5sum.txt"
- ]
- container_uuid: zzzzz-dz642-diagcomphasher3
- requesting_container_uuid: zzzzz-dz642-diagcompreq0002
- log_uuid: zzzzz-4zz18-dlogcollhash003
- output_uuid: zzzzz-4zz18-znfnqtbbv4spc3w
- runtime_constraints:
- vcpus: 1
- ram: 2684354560
- API: true
-
requester:
uuid: zzzzz-xvhdp-9zacv3o1xw6sxz5
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list