17152: Adjusts cypress integration tests.

* Changes arvados' config disabling the collection idle versioning feature.
* Fixes one test that required versioning when updating via API calls.

The rest of the versioning tests continue to work because of the updates made
on workbench2.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/cypress/integration/collection-panel.spec.js b/cypress/integration/collection-panel.spec.js
index 980c55056530bea82c80e4dc0bb2713e2d2f6f97..23ba682e51c27bdba42e9b1a975edcfb56efdaaa 100644 (file)
--- a/cypress/integration/collection-panel.spec.js
+++ b/cypress/integration/collection-panel.spec.js
@@ -269,6 +269,7 @@ describe('Collection panel tests', function() {
         cy.createCollection(adminUser.token, {
             name: colName,
             owner_uuid: activeUser.user.uuid,
+            preserve_version: true,
             manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"})
         .as('originalVersion').then(function() {
             // Change the file name to create a new version.
@@ -309,6 +310,7 @@ describe('Collection panel tests', function() {
         cy.createCollection(adminUser.token, {
             name: colName,
             owner_uuid: activeUser.user.uuid,
+            preserve_version: true,
             manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n"})
         .as('collection').then(function() {
             // Visit collection, check basic information

diff --git a/cypress/integration/search.spec.js b/cypress/integration/search.spec.js
index 60292aa50e3edfb927605f1346a126b984420700..06131a2ef09c3966f8e009c661e78aea0fb174f9 100644 (file)
--- a/cypress/integration/search.spec.js
+++ b/cypress/integration/search.spec.js
@@ -46,6 +46,7 @@ describe('Search tests', function() {
         cy.createCollection(adminUser.token, {
             name: colName,
             owner_uuid: activeUser.user.uuid,
+            preserve_version: true,
             manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"})
         .as('originalVersion').then(function() {
             // Change the file name to create a new version.

diff --git a/tools/arvados_config.yml b/tools/arvados_config.yml
index b533156de067fb0ac20aec0b63e5bb531b6637e3..d93ec7ae5971cb3e6b529b561f5102690e4daae9 100644 (file)
--- a/tools/arvados_config.yml
+++ b/tools/arvados_config.yml
@@ -8,7 +8,7 @@ Clusters:
       Insecure: true
     Collections:
       CollectionVersioning: true
-      PreserveVersionIfIdle: 0s
+      PreserveVersionIfIdle: -1s
       BlobSigningKey: zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc
       TrustAllContent: true
       ForwardSlashNameSubstitution: /