[ARVADOS] updated: 2.1.0-252-g3203d60cc
Git user
git at public.arvados.org
Mon Jan 11 15:57:23 UTC 2021
Summary of changes:
lib/controller/federation_test.go | 4 +-
services/api/test/fixtures/container_requests.yml | 226 ----------------------
2 files changed, 3 insertions(+), 227 deletions(-)
via 3203d60cc00cdd004ab717e8cc1898e5c9af75b8 (commit)
from 87237527d78621513fb73f619d2b3f49e84451c5 (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 3203d60cc00cdd004ab717e8cc1898e5c9af75b8
Author: Nico Cesar <nico at nicocesar.com>
Date: Mon Jan 11 10:56:28 2021 -0500
addressing https://dev.arvados.org/issues/17014#note-36
Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>
diff --git a/lib/controller/federation_test.go b/lib/controller/federation_test.go
index cabd3f99e..a92fc7105 100644
--- a/lib/controller/federation_test.go
+++ b/lib/controller/federation_test.go
@@ -633,7 +633,9 @@ func (s *FederationSuite) TestCreateRemoteContainerRequest(c *check.C) {
c.Check(strings.HasPrefix(cr.UUID, "zzzzz-"), check.Equals, true)
}
-// getCRfromMockRequest returns a ContainerRequest with the content of
+// getCRfromMockRequest returns a ContainerRequest with the content of the
+// request sent to the remote mock. This function takes into account the
+// Content-Type and acts accordingly.
func (s *FederationSuite) getCRfromMockRequest(c *check.C) arvados.ContainerRequest {
// Body can be a json formated or something like:
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