From: Lucas Di Pentima <lucas@curoverse.com>
Date: Mon, 12 Sep 2016 20:55:07 +0000 (-0300)
Subject: 9623: Removed fixtures additions meant for Container reuse tests because some of... 
X-Git-Tag: 1.1.0~731^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/bcd205719cb6dcaacfae9ee99b43d8e35fe8f072

9623: Removed fixtures additions meant for Container reuse tests because some of them made other integration tests to fail.
---

diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index aa0a125379..433aff210a 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -16,59 +16,6 @@ queued:
   runtime_constraints:
     vcpus: 1
     ram: 123
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: queued
-
-queued_higher_priority:
-  uuid: zzzzz-xvhdp-cr4queuedcontnrhigher
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  name: queued_hp
-  state: Committed
-  priority: 2
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
-  modified_at: 2016-01-11 11:11:11.111111111 Z
-  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  container_image: test
-  cwd: test
-  output_path: test
-  command: ["echo", "hello"]
-  container_uuid: zzzzz-dz642-queuedcontainerhigher
-  runtime_constraints:
-    vcpus: 1
-    ram: 123
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: queued
-
-locked_vs_queued_loser:
-  uuid: zzzzz-xvhdp-cr4lockedvsqueuedloser
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  name: lockedvqueuedloser
-  state: Committed
-  priority: 2
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
-  modified_at: 2016-01-11 11:11:11.111111111 Z
-  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  container_image: test
-  cwd: test
-  output_path: test
-  command: ["echo", "hello"]
-  container_uuid: zzzzz-dz642-lvqloser
-  runtime_constraints:
-    vcpus: 1
-    ram: 123
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: locked_vs_queued
 
 running:
   uuid: zzzzz-xvhdp-cr4runningcntnr
diff --git a/services/api/test/fixtures/containers.yml b/services/api/test/fixtures/containers.yml
index 65323f5a9c..1492dcc7ce 100644
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@ -12,31 +12,6 @@ queued:
   runtime_constraints:
     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
 
 running:
   uuid: zzzzz-dz642-runningcontainr
@@ -54,11 +29,6 @@ running:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: running
   auth_uuid: zzzzz-gj3su-077z32aux8dg2s1
 
 running_older:
@@ -77,11 +47,6 @@ running_older:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: running
 
 locked:
   uuid: zzzzz-dz642-lockedcontainer
@@ -97,11 +62,6 @@ locked:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: locked
 
 locked_higher_priority:
   uuid: zzzzz-dz642-lockedcontainerhigher
@@ -117,11 +77,6 @@ locked_higher_priority:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: locked
 
 completed:
   uuid: zzzzz-dz642-compltcontainer
@@ -139,11 +94,6 @@ completed:
   output: zzzzz-4zz18-znfnqtbbv4spc3w
   output_path: test
   command: ["echo", "hello"]
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: completed
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
@@ -164,11 +114,6 @@ completed_older:
   log: test
   output_path: test
   command: ["echo", "hello"]
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: completed
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
@@ -225,131 +170,3 @@ failed_container:
   runtime_constraints:
     ram: 12000000000
     vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: failed
-
-completed_vs_running_winner:
-  uuid: zzzzz-dz642-cvrwinner
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  exit_code: 0
-  output: test
-  log: test
-  state: Complete
-  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: completed_vs_running
-
-completed_vs_running_loser:
-  uuid: zzzzz-dz642-cvrloser
-  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
-  container_image: test
-  cwd: test
-  output_path: test
-  command: ["echo", "hello"]
-  runtime_constraints:
-    ram: 12000000000
-    vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: completed_vs_running
-
-running_vs_locked_winner:
-  uuid: zzzzz-dz642-rvlwinner
-  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
-  container_image: test
-  cwd: test
-  output_path: test
-  command: ["echo", "hello"]
-  runtime_constraints:
-    ram: 12000000000
-    vcpus: 4
-  mounts:
-    test:
-      kind: json
-  environment:
-    var: running_vs_locked
-
-running_vs_locked_loser:
-  uuid: zzzzz-dz642-rvlloser
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  state: Locked
-  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: running_vs_locked
-
-locked_vs_queued_winner:
-  uuid: zzzzz-dz642-lvqwinner
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  state: Locked
-  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
-
-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