[ARVADOS] created: 2.1.0-1386-g63a6e6eed
Git user
git at public.arvados.org
Tue Sep 21 19:50:54 UTC 2021
at 63a6e6eed61d114f562d5acb994b84c40b4d7d22 (commit)
commit 63a6e6eed61d114f562d5acb994b84c40b4d7d22
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Sep 21 16:45:02 2021 -0300
Fixes the 'branchname' variable setting used on salt doc pages. Refs #18130
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/doc/_includes/_branchname.liquid b/doc/_includes/_branchname.liquid
new file mode 100644
index 000000000..44707e3f9
--- /dev/null
+++ b/doc/_includes/_branchname.liquid
@@ -0,0 +1,11 @@
+{% comment %}
+Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: CC-BY-SA-3.0
+{% endcomment %}
+
+{% if site.current_version and site.current_version != 'main' %}
+{% assign branchname = site.current_version | slice: 0, 3 | append: '-dev' %}
+{% else %}
+{% assign branchname = 'main' %}
+{% endif %}
diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 2e4f49b01..0d7fb916e 100644
--- a/doc/install/salt-multi-host.html.textile.liquid
+++ b/doc/install/salt-multi-host.html.textile.liquid
@@ -75,11 +75,7 @@ We added a few "terraform":https://terraform.io/ scripts (https://github.com/arv
h2(#multi_host). Multi host install using the provision.sh script
-{% if site.current_version %}
-{% assign branchname = site.current_version | slice: 1, 5 | append: '-dev' %}
-{% else %}
-{% assign branchname = 'main' %}
-{% endif %}
+{% include 'branchname' %}
This is a package-based installation method. Start with the @provision.sh@ script which is available by cloning the @{{ branchname }}@ branch from "https://git.arvados.org/arvados.git":https://git.arvados.org/arvados.git . The @provision.sh@ script and its supporting files can be found in the "arvados/tools/salt-install":https://git.arvados.org/arvados.git/tree/refs/heads/{{ branchname }}:/tools/salt-install directory in the Arvados git repository.
diff --git a/doc/install/salt-single-host.html.textile.liquid b/doc/install/salt-single-host.html.textile.liquid
index 6a066f77b..6ca6738e3 100644
--- a/doc/install/salt-single-host.html.textile.liquid
+++ b/doc/install/salt-single-host.html.textile.liquid
@@ -25,11 +25,7 @@ h2(#single_host). Single host install using the provision.sh script
<b>NOTE: The single host installation is not recommended for production use.</b>
-{% if site.current_version %}
-{% assign branchname = site.current_version | slice: 1, 5 | append: '-dev' %}
-{% else %}
-{% assign branchname = 'main' %}
-{% endif %}
+{% include 'branchname' %}
This is a package-based installation method. Start with the @provision.sh@ script which is available by cloning the @{{ branchname }}@ branch from "https://git.arvados.org/arvados.git":https://git.arvados.org/arvados.git . The @provision.sh@ script and its supporting files can be found in the "arvados/tools/salt-install":https://git.arvados.org/arvados.git/tree/refs/heads/{{ branchname }}:/tools/salt-install directory in the Arvados git repository.
diff --git a/doc/install/salt.html.textile.liquid b/doc/install/salt.html.textile.liquid
index f59f4b06e..8db0ac15e 100644
--- a/doc/install/salt.html.textile.liquid
+++ b/doc/install/salt.html.textile.liquid
@@ -19,11 +19,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
h2(#introduction). Introduction
-{% if site.current_version %}
-{% assign branchname = site.current_version | slice: 1, 5 | append: '-dev' %}
-{% else %}
-{% assign branchname = 'main' %}
-{% endif %}
+{% include 'branchname' %}
To ease the installation of the various Arvados components, we have developed a "Saltstack":https://www.saltstack.com/ 's "arvados-formula":https://git.arvados.org/arvados-formula.git which can help you get an Arvados cluster up and running.
commit 178d5c863d23cc5eef843afd85f978af7b595c48
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Sep 21 15:50:42 2021 -0300
Adds missing 'branchname' var setting on doc page. Refs #18130
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/doc/install/salt.html.textile.liquid b/doc/install/salt.html.textile.liquid
index d110f7300..f59f4b06e 100644
--- a/doc/install/salt.html.textile.liquid
+++ b/doc/install/salt.html.textile.liquid
@@ -19,6 +19,12 @@ SPDX-License-Identifier: CC-BY-SA-3.0
h2(#introduction). Introduction
+{% if site.current_version %}
+{% assign branchname = site.current_version | slice: 1, 5 | append: '-dev' %}
+{% else %}
+{% assign branchname = 'main' %}
+{% endif %}
+
To ease the installation of the various Arvados components, we have developed a "Saltstack":https://www.saltstack.com/ 's "arvados-formula":https://git.arvados.org/arvados-formula.git which can help you get an Arvados cluster up and running.
Saltstack is a Python-based, open-source software for event-driven IT automation, remote task execution, and configuration management. It can be used in a _master/minion_ setup (where a master node orchestrates and coordinates the configuration of nodes in an infrastructure) or <i>master-less</i>, where Saltstack is run locally in a node, with no communication with a master node.
commit ee302fa53f2aab19c3cd8299f724448e7e7cf964
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Sep 21 14:39:36 2021 -0300
Point 2.3 arvbox to 2.3 branches. Refs #18130
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 516ea3534..c71f7da37 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -53,11 +53,11 @@ if test -z "$WORKBENCH2_ROOT" ; then
fi
if test -z "$ARVADOS_BRANCH" ; then
- ARVADOS_BRANCH=main
+ ARVADOS_BRANCH=2.3-dev
fi
if test -z "$WORKBENCH2_BRANCH" ; then
- WORKBENCH2_BRANCH=main
+ WORKBENCH2_BRANCH=2.3-dev
fi
# Update this to the docker tag for the version on releases.
commit c68f81ceca657f299cb23f6a0d2b0d8e3e068258
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Mon Sep 20 15:26:12 2021 -0300
Pin arvados 2.3.0 version in provision.sh. Refs #18130
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index b840d86c6..32a21a5da 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -166,14 +166,14 @@ WORKBENCH2_EXT_SSL_PORT=3001
# release.
# The "local.params.example.*" files already set "RELEASE=production"
# to deploy production-ready packages
-RELEASE="development"
-VERSION="latest"
+RELEASE="production"
+VERSION="2.3.0-1"
# 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"
-# BRANCH="main"
+# ARVADOS_TAG="2.3.0"
+BRANCH="2.3-dev"
# Other formula versions we depend on
POSTGRES_TAG="v0.41.6"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list