[ARVADOS] updated: 2.1.0-153-g8b1f33a3b

[Git user]

Summary of changes:
 tools/salt-install/tests/run-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  8b1f33a3bdf2ce232ca300710649141fce5c71ff (commit)
       via  e3348e128e63014a1122ce42fb2a3eb23ed64c35 (commit)
      from  186d199ed06554cc5ddbdd7fc9d33622710fff88 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8b1f33a3bdf2ce232ca300710649141fce5c71ff
Merge: 186d199ed e3348e128
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Thu Nov 26 15:49:50 2020 -0300

    Merge branch 'pvanheus-fix_cluster_test' from github.com/pvanheus:fix_cluster_test
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>


commit e3348e128e63014a1122ce42fb2a3eb23ed64c35
Author: Peter van Heusden <pvh at sanbi.ac.za>
Date:   Thu Nov 26 20:35:16 2020 +0200

    Fix hardcoded initial user name and email
    
    Arvados-DCO-1.1-Signed-off-by: Peter Van Heusden <vh at sanbi.ac.za>

diff --git a/tools/salt-install/tests/run-test.sh b/tools/salt-install/tests/run-test.sh
index 7726d86ec..cf61d92b5 100755
--- a/tools/salt-install/tests/run-test.sh
+++ b/tools/salt-install/tests/run-test.sh
@@ -34,7 +34,7 @@ arv-keepdocker --pull arvados/jobs "${VERSION}" --project-uuid "${project_uuid}"
 
 # Create the initial user
 echo "Creating initial user '__INITIAL_USER__'"
-user_uuid=$(arv --format=uuid user list --filters '[["email", "=", "admin at arva2.arv.local"], ["username", "=", "admin"]]')
+user_uuid=$(arv --format=uuid user list --filters '[["email", "=", "__INITIAL_USER_EMAIL__"], ["username", "=", "__INITIAL_USER__"]]')
 
 if [ "x${user_uuid}" = "x" ]; then
   user_uuid=$(arv --format=uuid user create --user '{"email": "__INITIAL_USER_EMAIL__", "username": "__INITIAL_USER__"}')

-----------------------------------------------------------------------


hooks/post-receive
--