X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4eef0a298418a751b5941fd6f4bf32d91b817d54..de11b137d4469e9d54e078ac0dd5664bdb90e486:/services/api/test/fixtures/containers.yml

diff --git a/services/api/test/fixtures/containers.yml b/services/api/test/fixtures/containers.yml
index 65323f5a9c..f18adb5dbd 100644
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@ -1,6 +1,10 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 queued:
   uuid: zzzzz-dz642-queuedcontainer
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Queued
   priority: 1
   created_at: 2016-01-11 11:11:11.111111111 Z
@@ -13,37 +17,18 @@ queued:
     ram: 12000000000
     vcpus: 4
   mounts:
-    test:
-      kind: json
-  environment:
-    var: queued
-
-queued_higher_priority:
-  uuid: zzzzz-dz642-queuedcontainerhigher
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  state: Queued
-  priority: 2
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
-  container_image: test
-  cwd: test
-  output_path: test
-  command: ["echo", "hello"]
-  runtime_constraints:
-    ram: 12000000000
-    vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: queued
+    /tmp:
+      kind: tmp
+      capacity: 24000000000
+    /var/spool/cwl:
+      kind: tmp
+      capacity: 24000000000
 
 running:
   uuid: zzzzz-dz642-runningcontainr
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Running
-  priority: 1
-  progress: 10.0
+  priority: 12
   created_at: <%= 1.minute.ago.to_s(:db) %>
   updated_at: <%= 1.minute.ago.to_s(:db) %>
   started_at: <%= 1.minute.ago.to_s(:db) %>
@@ -54,19 +39,18 @@ running:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: running
-  auth_uuid: zzzzz-gj3su-077z32aux8dg2s1
+  secret_mounts:
+    /secret/6x9:
+      kind: text
+      content: "42\n"
+  secret_mounts_md5: <%= Digest::MD5.hexdigest(SafeJSON.dump({'/secret/6x9' => {'content' => "42\n", 'kind' => 'text'}})) %>
+  auth_uuid: zzzzz-gj3su-077z32aux8dg2s2
 
 running_older:
   uuid: zzzzz-dz642-runningcontain2
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Running
   priority: 1
-  progress: 15.0
   created_at: <%= 2.minute.ago.to_s(:db) %>
   updated_at: <%= 2.minute.ago.to_s(:db) %>
   started_at: <%= 2.minute.ago.to_s(:db) %>
@@ -77,19 +61,18 @@ running_older:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: running
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
 locked:
   uuid: zzzzz-dz642-lockedcontainer
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Locked
+  locked_by_uuid: zzzzz-gj3su-k9dvestay1plssr
   priority: 2
   created_at: <%= 2.minute.ago.to_s(:db) %>
   updated_at: <%= 2.minute.ago.to_s(:db) %>
+  modified_at: <%= 2.minute.ago.to_s(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -97,35 +80,12 @@ locked:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: locked
-
-locked_higher_priority:
-  uuid: zzzzz-dz642-lockedcontainerhigher
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  state: Locked
-  priority: 3
-  created_at: <%= 2.minute.ago.to_s(:db) %>
-  updated_at: <%= 2.minute.ago.to_s(:db) %>
-  container_image: test
-  cwd: test
-  output_path: test
-  command: ["echo", "hello"]
-  runtime_constraints:
-    ram: 12000000000
-    vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: locked
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
 completed:
   uuid: zzzzz-dz642-compltcontainer
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Complete
   exit_code: 0
   priority: 1
@@ -136,21 +96,18 @@ completed:
   container_image: test
   cwd: test
   log: ea10d51bcf88862dbcc36eb292017dfd+45
-  output: zzzzz-4zz18-znfnqtbbv4spc3w
+  output: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
   output_path: test
-  command: ["echo", "hello"]
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: completed
+  command: ["echo", "hello", "/bin/sh", "-c", "'cat' '/keep/fa7aeb5140e2848d39b416daeef4ffc5+45/foobar' '/keep/fa7aeb5140e2848d39b416daeef4ffc5+45/baz' '|' 'gzip' '>' '/dev/null'"]
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
 completed_older:
   uuid: zzzzz-dz642-compltcontainr2
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Complete
   exit_code: 0
   priority: 1
@@ -160,22 +117,18 @@ completed_older:
   finished_at: 2016-01-14 11:12:13.111111111 Z
   container_image: test
   cwd: test
-  output: test
-  log: test
+  output: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
   output_path: test
   command: ["echo", "hello"]
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: completed
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
 requester:
   uuid: zzzzz-dz642-requestingcntnr
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Complete
   exit_code: 0
   priority: 1
@@ -183,16 +136,18 @@ requester:
   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
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
 requester_container:
   uuid: zzzzz-dz642-requestercntnr1
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Complete
   exit_code: 0
   priority: 1
@@ -200,16 +155,17 @@ requester_container:
   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
-  auth_uuid: zzzzz-gj3su-077z32aux8dg2s1
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
 failed_container:
-  uuid: zzzzz-dz642-failedcntnr
+  uuid: zzzzz-dz642-failedcontainr1
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   state: Complete
   exit_code: 33
@@ -218,29 +174,23 @@ failed_container:
   updated_at: 2016-01-11 11:11:11.111111111 Z
   container_image: test
   cwd: test
-  output: test
-  log: test
+  output: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
   output_path: test
   command: ["echo", "hello"]
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: failed
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
-completed_vs_running_winner:
-  uuid: zzzzz-dz642-cvrwinner
+ancient_container_with_logs:
+  uuid: zzzzz-dz642-logscontainer01
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  exit_code: 0
-  output: test
-  log: test
   state: Complete
+  exit_code: 0
   priority: 1
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
+  created_at: <%= 2.year.ago.to_s(:db) %>
+  updated_at: <%= 2.year.ago.to_s(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -248,19 +198,20 @@ completed_vs_running_winner:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: completed_vs_running
+  finished_at: <%= 2.year.ago.to_s(:db) %>
+  log: ea10d51bcf88862dbcc36eb292017dfd+45
+  output: test
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
-completed_vs_running_loser:
-  uuid: zzzzz-dz642-cvrloser
+previous_container_with_logs:
+  uuid: zzzzz-dz642-logscontainer02
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  state: Running
+  state: Complete
+  exit_code: 0
   priority: 1
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
+  created_at: <%= 1.month.ago.to_s(:db) %>
+  updated_at: <%= 1.month.ago.to_s(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -268,19 +219,19 @@ completed_vs_running_loser:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: completed_vs_running
+  finished_at: <%= 1.month.ago.to_s(:db) %>
+  log: ea10d51bcf88862dbcc36eb292017dfd+45
+  output: test
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
-running_vs_locked_winner:
-  uuid: zzzzz-dz642-rvlwinner
+running_container_with_logs:
+  uuid: zzzzz-dz642-logscontainer03
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   state: Running
   priority: 1
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
+  created_at: <%= 1.hour.ago.to_s(:db) %>
+  updated_at: <%= 1.hour.ago.to_s(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -288,19 +239,17 @@ running_vs_locked_winner:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: running_vs_locked
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
-running_vs_locked_loser:
-  uuid: zzzzz-dz642-rvlloser
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  state: Locked
+running_to_be_deleted:
+  uuid: zzzzz-dz642-runnincntrtodel
+  owner_uuid: zzzzz-tpzed-000000000000000
+  state: Running
   priority: 1
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
+  created_at: <%= 1.minute.ago.to_s(:db) %>
+  updated_at: <%= 1.minute.ago.to_s(:db) %>
+  started_at: <%= 1.minute.ago.to_s(:db) %>
   container_image: test
   cwd: test
   output_path: test
@@ -308,16 +257,15 @@ running_vs_locked_loser:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: running_vs_locked
+  auth_uuid: zzzzz-gj3su-ty6lvu9d7u7c2sq
+  secret_mounts: {}
+  secret_mounts_md5: 99914b932bd37a50b983c5e7c90ae93b
 
-locked_vs_queued_winner:
-  uuid: zzzzz-dz642-lvqwinner
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+runtime_token:
+  uuid: zzzzz-dz642-20isqbkl8xwnsao
+  owner_uuid: zzzzz-tpzed-000000000000000
   state: Locked
+  locked_by_uuid: zzzzz-gj3su-jrriu629zljsnuf
   priority: 1
   created_at: 2016-01-11 11:11:11.111111111 Z
   updated_at: 2016-01-11 11:11:11.111111111 Z
@@ -325,31 +273,16 @@ locked_vs_queued_winner:
   cwd: test
   output_path: test
   command: ["echo", "hello"]
+  runtime_token: v2/zzzzz-gj3su-2nj68s291f50gd9/2d19ue6ofx26o3mm7fs9u6t7hov9um0v92dzwk1o2xed3abprw
+  runtime_user_uuid: zzzzz-tpzed-l3skomkti0c4vg4
+  runtime_auth_scopes: ["all"]
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
   mounts:
-    test:
-      kind: json
-  environment:
-    var: locked_vs_queued
-
-locked_vs_queued_loser:
-  uuid: zzzzz-dz642-lvqloser
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  state: Queued
-  priority: 1
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
-  container_image: test
-  cwd: test
-  output_path: test
-  command: ["echo", "hello"]
-  runtime_constraints:
-    ram: 12000000000
-    vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: locked_vs_queued
+    /tmp:
+      kind: tmp
+      capacity: 24000000000
+    /var/spool/cwl:
+      kind: tmp
+      capacity: 24000000000