[ARVADOS] updated: 2.3.2-21-gfc415fd31

Git user git at public.arvados.org
Thu Feb 3 16:43:18 UTC 2022


Summary of changes:
 tools/salt-install/Vagrantfile                                      | 2 +-
 tools/salt-install/local.params.example.multiple_hosts              | 2 +-
 .../local.params.example.single_host_multiple_hostnames             | 2 +-
 tools/salt-install/local.params.example.single_host_single_hostname | 2 +-
 tools/salt-install/provision.sh                                     | 6 ++----
 5 files changed, 6 insertions(+), 8 deletions(-)

       via  fc415fd3128c5f3772a7f1a1376007c75b588b4c (commit)
       via  b6ff0066e51f63b2b48c4889d2af2fa037d18f3a (commit)
       via  ec3948a8a1473102ff8ee62be8625327398f4726 (commit)
       via  0c82d98fb3d1bde830166e8ef8384d6314a3c8b7 (commit)
       via  94ff4727707e36a9da901804d66b5f3f39cad0b7 (commit)
      from  da3b2b9f1736d90a2cea996c526aea5465bad85f (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 fc415fd3128c5f3772a7f1a1376007c75b588b4c
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Tue Feb 1 20:15:40 2022 -0300

    18703: upgrade Vagrantfile to debian-11
    
    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 f7f8da3b1..f5759c482 100644
--- a/tools/salt-install/Vagrantfile
+++ b/tools/salt-install/Vagrantfile
@@ -13,7 +13,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
    # A single_host multiple_hostnames example
    config.vm.define "arvados-sh-mn" do |arv|
-     arv.vm.box = "bento/debian-10"
+     arv.vm.box = "bento/debian-11"
      arv.vm.hostname = "harpo"
      # CPU/RAM
      config.vm.provider :virtualbox do |v|

commit b6ff0066e51f63b2b48c4889d2af2fa037d18f3a
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Tue Feb 1 20:14:59 2022 -0300

    18703: upgrade postgres-formula to 0.43.0 for debian-11
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index c6f196ca9..cb0afecc4 100644
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -119,7 +119,7 @@ RELEASE="production"
 
 # Formulas versions
 # ARVADOS_TAG="2.2.0"
-# POSTGRES_TAG="v0.41.6"
+# POSTGRES_TAG="v0.43.0"
 # NGINX_TAG="temp-fix-missing-statements-in-pillar"
 # DOCKER_TAG="v2.0.7"
 # LOCALE_TAG="v0.3.4"
diff --git a/tools/salt-install/local.params.example.single_host_multiple_hostnames b/tools/salt-install/local.params.example.single_host_multiple_hostnames
index 76e88786b..ef47467e5 100644
--- a/tools/salt-install/local.params.example.single_host_multiple_hostnames
+++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames
@@ -95,7 +95,7 @@ RELEASE="production"
 
 # Formulas versions
 # ARVADOS_TAG="2.2.0"
-# POSTGRES_TAG="v0.41.6"
+# POSTGRES_TAG="v0.43.0"
 # NGINX_TAG="temp-fix-missing-statements-in-pillar"
 # DOCKER_TAG="v2.0.7"
 # LOCALE_TAG="v0.3.4"
diff --git a/tools/salt-install/local.params.example.single_host_single_hostname b/tools/salt-install/local.params.example.single_host_single_hostname
index fc2db58c0..d09cdb2ef 100644
--- a/tools/salt-install/local.params.example.single_host_single_hostname
+++ b/tools/salt-install/local.params.example.single_host_single_hostname
@@ -82,7 +82,7 @@ RELEASE="production"
 
 # Formulas versions
 # ARVADOS_TAG="2.2.0"
-# POSTGRES_TAG="v0.41.6"
+# POSTGRES_TAG="v0.43.0"
 # NGINX_TAG="temp-fix-missing-statements-in-pillar"
 # DOCKER_TAG="v2.0.7"
 # LOCALE_TAG="v0.3.4"
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index baa1f90a9..b323a5a83 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -204,7 +204,7 @@ VERSION="2.3.2-1"
 BRANCH="2.3-release"
 
 # Other formula versions we depend on
-POSTGRES_TAG="v0.41.6"
+POSTGRES_TAG="v0.43.0"
 NGINX_TAG="temp-fix-missing-statements-in-pillar"
 DOCKER_TAG="v2.0.7"
 LOCALE_TAG="v0.3.4"

commit ec3948a8a1473102ff8ee62be8625327398f4726
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Fri Jan 28 15:36:03 2022 -0300

    18632: address review comments.
    
    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 4b21ceb3f..baa1f90a9 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -694,10 +694,9 @@ else
       ;;
       "dispatcher")
         # States
-        grep -q "docker" ${S_DIR}/top.sls       || echo "    - docker.software" >> ${S_DIR}/top.sls
         grep -q "arvados.${R}" ${S_DIR}/top.sls || echo "    - arvados.${R}" >> ${S_DIR}/top.sls
         # Pillars
-        grep -q "docker" ${P_DIR}/top.sls       || echo "    - docker" >> ${P_DIR}/top.sls
+        # ATM, no specific pillar needed
       ;;
       "keepstore")
         # States

commit 0c82d98fb3d1bde830166e8ef8384d6314a3c8b7
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Thu Jan 27 19:06:33 2022 -0300

    18632: fix missing docker's pillar in shell node
    
    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 194b12ffd..4b21ceb3f 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -607,7 +607,6 @@ else
         grep -q "arvados.${R}" ${S_DIR}/top.sls    || echo "    - arvados.${R}" >> ${S_DIR}/top.sls
         # Pillars
         grep -q "aws_credentials" ${P_DIR}/top.sls          || echo "    - aws_credentials" >> ${P_DIR}/top.sls
-        grep -q "docker" ${P_DIR}/top.sls                   || echo "    - docker" >> ${P_DIR}/top.sls
         grep -q "postgresql" ${P_DIR}/top.sls               || echo "    - postgresql" >> ${P_DIR}/top.sls
         grep -q "nginx_passenger" ${P_DIR}/top.sls          || echo "    - nginx_passenger" >> ${P_DIR}/top.sls
         grep -q "nginx_${R}_configuration" ${P_DIR}/top.sls || echo "    - nginx_${R}_configuration" >> ${P_DIR}/top.sls
@@ -698,7 +697,7 @@ else
         grep -q "docker" ${S_DIR}/top.sls       || echo "    - docker.software" >> ${S_DIR}/top.sls
         grep -q "arvados.${R}" ${S_DIR}/top.sls || echo "    - arvados.${R}" >> ${S_DIR}/top.sls
         # Pillars
-        # ATM, no specific pillar needed
+        grep -q "docker" ${P_DIR}/top.sls       || echo "    - docker" >> ${P_DIR}/top.sls
       ;;
       "keepstore")
         # States

commit 94ff4727707e36a9da901804d66b5f3f39cad0b7
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Thu Jan 27 15:31:04 2022 -0300

    18632: fix docker pillar in provision script
    
    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 b498bdf60..194b12ffd 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -691,7 +691,7 @@ else
         grep -q "docker" ${S_DIR}/top.sls       || echo "    - docker.software" >> ${S_DIR}/top.sls
         grep -q "arvados.${R}" ${S_DIR}/top.sls || echo "    - arvados.${R}" >> ${S_DIR}/top.sls
         # Pillars
-        grep -q "" ${P_DIR}/top.sls                             || echo "    - docker" >> ${P_DIR}/top.sls
+        grep -q "docker" ${P_DIR}/top.sls       || echo "    - docker" >> ${P_DIR}/top.sls
       ;;
       "dispatcher")
         # States

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list