21118: Fix tests and pass ${ci} var

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/Makefile b/Makefile
index 54d8aa0aa07c9eb4f63ad98c0afc424e0ee37e77..e8ac284d0b508cd10b2865f3ce5c7f9d14854d38 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ unit-tests-in-docker: workbench2-build-image check-arvados-directory
        docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make unit-tests
 
 tests-in-docker: workbench2-build-image check-arvados-directory
-       docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make test
+       docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados -e ci="${ci}" workbench2-build make test
 
 test: unit-tests integration-tests
 

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index c0291e261328fc7b835d7dfca27e696090fe6de5..1682a8a814440c875fa43ba312e0d76beea183ba 100644 (file)
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -99,7 +99,7 @@ Cypress.Commands.add("getUser", (username, first_name = "", last_name = "", is_a
                         last_name: last_name,
                         alternate_emails: [],
                     }),
-                    return_to: ",https://example.local",
+                    return_to: ",https://controller.api.client.invalid",
                 },
                 null,
                 systemToken,