From: Brett Smith <brett.smith@curii.com>
Date: Thu, 30 May 2024 21:11:11 +0000 (-0400)
Subject: 21388: Modernize RPM install instructions
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/038bad61671b9cbd1157be850c536f3a7a7f047f

21388: Modernize RPM install instructions

* Prefer `dnf` over `yum`
* Remove old, unused SCL instructions
* Update a stray package name from that time

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>
---

diff --git a/doc/_includes/_note_python_sc.liquid b/doc/_includes/_note_python_sc.liquid
deleted file mode 100644
index 4b081770a7..0000000000
--- a/doc/_includes/_note_python_sc.liquid
+++ /dev/null
@@ -1,29 +0,0 @@
-{% comment %}
-Copyright (C) The Arvados Authors. All rights reserved.
-
-SPDX-License-Identifier: CC-BY-SA-3.0
-{% endcomment %}
-
-{% include 'notebox_begin' %}
-
-{% if rh_version %} On CentOS {{rh_version}} and RHEL {{rh_version}},
-{% else %} On CentOS and RHEL,
-{% endif %} these packages require a more recent version from Software Collections.  The Software Collection will be installed automatically as long as Software Collections are enabled on your system.
-
-To "enable Software Collections on CentOS":https://wiki.centos.org/AdditionalResources/Repositories/SCL, run:
-
-<notextile>
-<pre><code>~$ <span class="userinput">sudo yum install centos-release-scl scl-utils</span>
-</code></pre>
-</notextile>
-
-To enable Software Collections on RHEL:
-
-<notextile>
-<pre><code>~$ <span class="userinput">sudo yum-config-manager --enable rhel-server-rhscl-7-rpms</span>
-</code></pre>
-</notextile>
-
-"See also section 2.1 of Red Hat's Installation chapter":https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/2/html/2.0_Release_Notes/chap-Installation.html .
-
-{% include 'notebox_end' %}
diff --git a/doc/admin/keep-measuring-deduplication.html.textile.liquid b/doc/admin/keep-measuring-deduplication.html.textile.liquid
index 13838f61fe..2a45d643d3 100644
--- a/doc/admin/keep-measuring-deduplication.html.textile.liquid
+++ b/doc/admin/keep-measuring-deduplication.html.textile.liquid
@@ -10,7 +10,7 @@ Copyright (C) The Arvados Authors. All rights reserved.
 SPDX-License-Identifier: CC-BY-SA-3.0
 {% endcomment %}
 
-The @arvados-client@ tool can be used to generate a deduplication report across an arbitrary number of collections. It can be installed from packages (@apt install arvados-client@ or @yum install arvados-client@).
+The @arvados-client@ tool can be used to generate a deduplication report across an arbitrary number of collections. It can be installed from packages (@apt install arvados-client@ or @dnf install arvados-client@).
 
 h2(#syntax). Syntax
 
diff --git a/doc/admin/maintenance-and-upgrading.html.textile.liquid b/doc/admin/maintenance-and-upgrading.html.textile.liquid
index ed1e1e412c..7b73da82ed 100644
--- a/doc/admin/maintenance-and-upgrading.html.textile.liquid
+++ b/doc/admin/maintenance-and-upgrading.html.textile.liquid
@@ -65,7 +65,7 @@ Upgrading Arvados typically involves the following steps:
 # Update compute nodes
 ## (cloud) Rebuild and deploy the "compute node image":{{site.baseurl}}/install/crunch2-cloud/install-compute-node.html
 ## (slurm/LSF) Upgrade the @python3-arvados-fuse@ package used on your compute nodes
-# Install new packages using @apt upgrade@ or @yum upgrade@.
+# Install new packages using @apt upgrade@ or @dnf upgrade@.
 # Wait for package installation scripts as they perform any necessary data migrations.
 # Run @arvados-server config-check@ to detect configuration errors or deprecated entries.
 # Verify that the Arvados services were restarted as part of the package upgrades.
diff --git a/doc/install/packages.html.textile.liquid b/doc/install/packages.html.textile.liquid
index ad480012e2..c94b4d3323 100644
--- a/doc/install/packages.html.textile.liquid
+++ b/doc/install/packages.html.textile.liquid
@@ -27,7 +27,7 @@ Packages are available for the following Red Hat-based distributions:
 * RHEL 8
 * Rocky Linux 8
 
-To install them with dnf or yum, save this configuration block in @/etc/yum.repos.d/arvados.repo@:
+To install them with dnf, save this configuration block in @/etc/yum.repos.d/arvados.repo@:
 
 <notextile>
 <pre><code>[arvados]
diff --git a/doc/user/cwl/costanalyzer.html.textile.liquid b/doc/user/cwl/costanalyzer.html.textile.liquid
index 1d20c85f54..5ef897e08a 100644
--- a/doc/user/cwl/costanalyzer.html.textile.liquid
+++ b/doc/user/cwl/costanalyzer.html.textile.liquid
@@ -17,7 +17,7 @@ This is only applicable when Arvados runs in a cloud environment and @arvados-di
 
 {% include 'notebox_end' %}
 
-The @arvados-client@ program can be used to analyze the cost of a workflow. It can be installed from packages (@apt install arvados-client@ or @yum install arvados-client@). The @arvados-client costanalyzer@ command analyzes the cost accounting information associated with Arvados container requests.
+The @arvados-client@ program can be used to analyze the cost of a workflow. It can be installed from packages (@apt install arvados-client@ or @dnf install arvados-client@). The @arvados-client costanalyzer@ command analyzes the cost accounting information associated with Arvados container requests.
 
 h2(#syntax). Syntax
 
diff --git a/doc/user/cwl/crunchstat-summary.html.textile.liquid b/doc/user/cwl/crunchstat-summary.html.textile.liquid
index a28acd56ec..b8d92ae473 100644
--- a/doc/user/cwl/crunchstat-summary.html.textile.liquid
+++ b/doc/user/cwl/crunchstat-summary.html.textile.liquid
@@ -13,7 +13,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
 
 *Note:* Starting from Arvados 2.7.2, these reports are generated automatically by @arvados-cwl-runner@ and can be found as @usage_report.html@ in a container request's log collection.
 
-The @crunchstat-summary@ tool can be used to analyze workflow and container performance. It can be installed from packages (@apt install python3-crunchstat-summary@ or @yum install rh-python36-python-crunchstat-summary@), or in a Python virtualenv (@pip install crunchstat_summary@). @crunchstat-summary@ analyzes the crunchstat lines from the logs of a container or workflow and generates a report in text or html format.
+The @crunchstat-summary@ tool can be used to analyze workflow and container performance. It can be installed from packages (@apt install python3-crunchstat-summary@ or @dnf install python3-crunchstat-summary@), or in a Python virtualenv (@pip install crunchstat_summary@). @crunchstat-summary@ analyzes the crunchstat lines from the logs of a container or workflow and generates a report in text or html format.
 
 h2(#syntax). Syntax
 
diff --git a/doc/user/debugging/container-shell-access.html.textile.liquid b/doc/user/debugging/container-shell-access.html.textile.liquid
index 9c24980049..f76db0593d 100644
--- a/doc/user/debugging/container-shell-access.html.textile.liquid
+++ b/doc/user/debugging/container-shell-access.html.textile.liquid
@@ -17,7 +17,7 @@ To use this feature, your Arvados installation must be configured to allow conta
 
 {% include 'notebox_end' %}
 
-The @arvados-client@ program can be used to connect to a container in a running workflow. It can be installed from packages (@apt install arvados-client@ or @yum install arvados-client@). The @arvados-client shell@ command provides an ssh connection into a running container.
+The @arvados-client@ program can be used to connect to a container in a running workflow. It can be installed from packages (@apt install arvados-client@ or @dnf install arvados-client@). The @arvados-client shell@ command provides an ssh connection into a running container.
 
 h2(#syntax). Syntax