projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10383: Merge branch 'master' into 10383-arv-put-incremental-upload
[arvados.git]
/
services
/
api
/
test
/
fixtures
/
containers.yml
diff --git
a/services/api/test/fixtures/containers.yml
b/services/api/test/fixtures/containers.yml
index 87098dcf53e96e693635bfd8ce355dbb2f012b36..d1f4c7bdc8fac1248aa80d3b0a88d674900cc8e8 100644
(file)
--- a/
services/api/test/fixtures/containers.yml
+++ b/
services/api/test/fixtures/containers.yml
@@
-28,7
+28,7
@@
running:
runtime_constraints:
ram: 12000000000
vcpus: 4
runtime_constraints:
ram: 12000000000
vcpus: 4
- auth_uuid: zzzzz-gj3su-077z32aux8dg2s
1
+ auth_uuid: zzzzz-gj3su-077z32aux8dg2s
2
running_older:
uuid: zzzzz-dz642-runningcontain2
running_older:
uuid: zzzzz-dz642-runningcontain2
@@
-74,7
+74,7
@@
completed:
container_image: test
cwd: test
log: ea10d51bcf88862dbcc36eb292017dfd+45
container_image: test
cwd: test
log: ea10d51bcf88862dbcc36eb292017dfd+45
- output:
zzzzz-4zz18-znfnqtbbv4spc3w
+ output:
1f4b0bc7583c2a7f9102c395f4ffc5e3+45
output_path: test
command: ["echo", "hello"]
runtime_constraints:
output_path: test
command: ["echo", "hello"]
runtime_constraints:
@@
-93,7
+93,7
@@
completed_older:
finished_at: 2016-01-14 11:12:13.111111111 Z
container_image: test
cwd: test
finished_at: 2016-01-14 11:12:13.111111111 Z
container_image: test
cwd: test
- output:
test
+ output:
1f4b0bc7583c2a7f9102c395f4ffc5e3+45
output_path: test
command: ["echo", "hello"]
runtime_constraints:
output_path: test
command: ["echo", "hello"]
runtime_constraints:
@@
-110,7
+110,7
@@
requester:
updated_at: 2016-01-11 11:11:11.111111111 Z
container_image: test
cwd: test
updated_at: 2016-01-11 11:11:11.111111111 Z
container_image: test
cwd: test
- output:
test
+ output:
1f4b0bc7583c2a7f9102c395f4ffc5e3+45
output_path: test
command: ["echo", "hello"]
runtime_constraints:
output_path: test
command: ["echo", "hello"]
runtime_constraints:
@@
-127,13
+127,13
@@
requester_container:
updated_at: 2016-01-11 11:11:11.111111111 Z
container_image: test
cwd: test
updated_at: 2016-01-11 11:11:11.111111111 Z
container_image: test
cwd: test
- output:
test
+ output:
1f4b0bc7583c2a7f9102c395f4ffc5e3+45
output_path: test
command: ["echo", "hello"]
runtime_constraints:
ram: 12000000000
vcpus: 4
output_path: test
command: ["echo", "hello"]
runtime_constraints:
ram: 12000000000
vcpus: 4
- auth_uuid: zzzzz-gj3su-077z32aux8dg2s
1
+ auth_uuid: zzzzz-gj3su-077z32aux8dg2s
3
failed_container:
uuid: zzzzz-dz642-failedcontainr1
failed_container:
uuid: zzzzz-dz642-failedcontainr1
@@
-145,7
+145,7
@@
failed_container:
updated_at: 2016-01-11 11:11:11.111111111 Z
container_image: test
cwd: test
updated_at: 2016-01-11 11:11:11.111111111 Z
container_image: test
cwd: test
- output:
test
+ output:
1f4b0bc7583c2a7f9102c395f4ffc5e3+45
output_path: test
command: ["echo", "hello"]
runtime_constraints:
output_path: test
command: ["echo", "hello"]
runtime_constraints: