[ARVADOS] created: 2.1.0-1834-g2014fbd1c
Git user
git at public.arvados.org
Wed Jan 19 15:29:46 UTC 2022
at 2014fbd1ced385de74040776905d86dca10264bd (commit)
commit 2014fbd1ced385de74040776905d86dca10264bd
Author: Javier Bértoli <jbertoli at curii.com>
Date: Wed Jan 19 12:19:47 2022 -0300
18378: update formulas used in provision to properly manage 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..53b799d59 100644
--- a/tools/salt-install/Vagrantfile
+++ b/tools/salt-install/Vagrantfile
@@ -13,7 +13,8 @@ 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.box = "bento/centos-7"
arv.vm.hostname = "harpo"
# CPU/RAM
config.vm.provider :virtualbox do |v|
@@ -40,7 +41,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
s/# VERSION=.*$/VERSION=\"latest\"/g;
s/#\ BRANCH=\"main\"/\ BRANCH=\"main\"/g' \
/vagrant/local.params.example.single_host_multiple_hostnames > /tmp/local.params.single_host_multiple_hostnames"
-
arv.vm.provision "shell",
path: "provision.sh",
args: [
@@ -54,7 +54,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# A single_host single_hostname example
config.vm.define "arvados-sh-sn" do |arv|
- arv.vm.box = "bento/debian-10"
+ arv.vm.box = "bento/debian-11"
arv.vm.hostname = "zeppo"
# CPU/RAM
config.vm.provider :virtualbox do |v|
diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index c770c8d74..38aad7f62 100644
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -115,9 +115,9 @@ RELEASE="production"
# Usually there's no need to modify things below this line
# Formulas versions
-# ARVADOS_TAG="2.2.0"
-# POSTGRES_TAG="v0.41.6"
+# ARVADOS_TAG="2.3.0"
+# POSTGRES_TAG="v0.43.0"
# NGINX_TAG="temp-fix-missing-statements-in-pillar"
-# DOCKER_TAG="v2.0.7"
-# LOCALE_TAG="v0.3.4"
-# LETSENCRYPT_TAG="v2.1.0"
+# DOCKER_TAG="v2.3.1"
+# LOCALE_TAG="v0.3.5"
+# LETSENCRYPT_TAG="v3.2.0"
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 cf79fe244..d1d1be01e 100644
--- a/tools/salt-install/local.params.example.single_host_multiple_hostnames
+++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames
@@ -88,9 +88,9 @@ RELEASE="production"
# Usually there's no need to modify things below this line
# Formulas versions
-# ARVADOS_TAG="2.2.0"
-# POSTGRES_TAG="v0.41.6"
+# ARVADOS_TAG="2.3.0"
+# POSTGRES_TAG="v0.43.0"
# NGINX_TAG="temp-fix-missing-statements-in-pillar"
-# DOCKER_TAG="v2.0.7"
-# LOCALE_TAG="v0.3.4"
-# LETSENCRYPT_TAG="v2.1.0"
+# DOCKER_TAG="v2.3.1"
+# LOCALE_TAG="v0.3.5"
+# LETSENCRYPT_TAG="v3.2.0"
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 ae9804863..02d9b3c3d 100644
--- a/tools/salt-install/local.params.example.single_host_single_hostname
+++ b/tools/salt-install/local.params.example.single_host_single_hostname
@@ -78,9 +78,9 @@ RELEASE="production"
# Usually there's no need to modify things below this line
# Formulas versions
-# ARVADOS_TAG="2.2.0"
-# POSTGRES_TAG="v0.41.6"
+# ARVADOS_TAG="2.3.0"
+# POSTGRES_TAG="v0.43.0"
# NGINX_TAG="temp-fix-missing-statements-in-pillar"
-# DOCKER_TAG="v2.0.7"
-# LOCALE_TAG="v0.3.4"
-# LETSENCRYPT_TAG="v2.1.0"
+# DOCKER_TAG="v2.3.1"
+# LOCALE_TAG="v0.3.5"
+# LETSENCRYPT_TAG="v3.2.0"
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 537f087b6..59096a6ac 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -180,15 +180,15 @@ VERSION="latest"
# These are arvados-formula-related parameters
# An arvados-formula tag. For a stable release, this should be a
# branch name (e.g. X.Y-dev) or tag for the release.
-# ARVADOS_TAG="2.2.0"
+# ARVADOS_TAG="2.3.0"
# BRANCH="main"
# 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"
-LETSENCRYPT_TAG="v2.1.0"
+DOCKER_TAG="v2.3.1"
+LOCALE_TAG="v0.3.5"
+LETSENCRYPT_TAG="v3.2.0"
# Salt's dir
DUMP_SALT_CONFIG_DIR=""
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list