[ARVADOS] updated: 2.1.0-107-g11c4d6f00

[Git user]

Summary of changes:
 tools/salt-install/Vagrantfile                                     | 2 +-
 tools/salt-install/provision.sh                                    | 1 +
 .../salt-install/single_host/docker.sls                            | 7 +++++--
 tools/salt-install/tests/run-test.sh                               | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
 copy apps/workbench/app/controllers/keep_services_controller.rb => tools/salt-install/single_host/docker.sls (62%)

       via  11c4d6f005ad651313e615fa4058185732fbe35d (commit)
       via  76928023247b3350e33a380e62d9aff286f528ae (commit)
      from  e9eaf87eca20700a7230631eaf6b68852daeda5a (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 11c4d6f005ad651313e615fa4058185732fbe35d
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Tue Nov 24 23:03:37 2020 -0300

    fix(test): wrong variable comparison
    
    refs #17146, #17147, #17150
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/Vagrantfile b/tools/salt-install/Vagrantfile
index a448824a9..ed3466dde 100644
--- a/tools/salt-install/Vagrantfile
+++ b/tools/salt-install/Vagrantfile
@@ -33,7 +33,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     arv.vm.provision "shell",
                      path: "provision.sh",
                      args: [
-                       # "--test",
+                       "--test",
                        "--vagrant",
                        "--ssl-port=8443"
                      ].join(" ")
diff --git a/tools/salt-install/tests/run-test.sh b/tools/salt-install/tests/run-test.sh
index a4614aa8b..7726d86ec 100755
--- a/tools/salt-install/tests/run-test.sh
+++ b/tools/salt-install/tests/run-test.sh
@@ -48,7 +48,7 @@ arv user update --uuid "${user_uuid}" --user '{"is_active": true}'
 echo "Getting the user API TOKEN"
 user_api_token=$(arv api_client_authorization list --filters "[[\"owner_uuid\", \"=\", \"${user_uuid}\"],[\"kind\", \"==\", \"arvados#apiClientAuthorization\"]]" --limit=1 |jq -r .items[].api_token)
 
-if [ "x${user_uuid}" = "x" ]; then
+if [ "x${user_api_token}" = "x" ]; then
   user_api_token=$(arv api_client_authorization create --api-client-authorization "{\"owner_uuid\": \"${user_uuid}\"}" | jq -r .api_token)
 fi
 

commit 76928023247b3350e33a380e62d9aff286f528ae
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Tue Nov 24 23:02:31 2020 -0300

    fix(docker): formula upgraded
    
    refs #17146, #17147, #17150
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 91cb39894..a207d0198 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -168,6 +168,7 @@ cat > ${P_DIR}/top.sls << EOFPSLS
 base:
   '*':
     - arvados
+    - docker
     - locale
     - nginx_api_configuration
     - nginx_controller_configuration
diff --git a/tools/salt-install/single_host/docker.sls b/tools/salt-install/single_host/docker.sls
new file mode 100644
index 000000000..54d225615
--- /dev/null
+++ b/tools/salt-install/single_host/docker.sls
@@ -0,0 +1,9 @@
+---
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+docker:
+  pkg:
+    docker:
+      use_upstream: package

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


hooks/post-receive
--