From 78deb7f8ea4f40758ffefc44352dfcbc435b5727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Palancher?= Date: Wed, 27 Nov 2024 09:08:28 +0100 Subject: [PATCH] docs: install packages from slurmweb-3 derivative After the release of Slurm-web 4 in main derivative, Slurm-web 3 can still be installed with slurmweb-3 packages repository derivative and higher priority to avoid upgrade. Also mention support of Fedora 41 and drop support of Fedora 39. --- CHANGELOG.md | 13 ++++++++ docs/antora.yml | 1 + .../install/pages/install/srcpkgs/deb.adoc | 4 +-- .../install/pages/install/srcpkgs/rpm.adoc | 8 ++--- .../install/partials/install/install-apt.adoc | 10 +++++++ .../install/partials/install/tabs-deb.adoc | 12 ++++---- .../install/partials/install/tabs-el.adoc | 22 ++++++++++++-- .../install/partials/install/tabs-fedora.adoc | 30 +++++++++++++++---- .../install/partials/install/tabs-ubuntu.adoc | 4 +-- 9 files changed, 82 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4be3301..4c7769a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [unreleased] + +### Added +- docs: Mention support of Fedora 41 + +### Changed +- docs: Update package repository settings to install Slurm-web 3 despite + Slurm-web 4 release with _slurmweb-3_ packages repository derivative and + higher priority to avoid upgrade. + +### Removed +- docs: remove mention of support of Fedora 39 + ## [3.2.0] - 2024-09-05 ### Added diff --git a/docs/antora.yml b/docs/antora.yml index 5c2b4a9c..3524d0b2 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -7,6 +7,7 @@ asciidoc: source-language: asciidoc@ table-caption: false version: 3.2.0 + pkgs-derivative: slurmweb-3 nav: - modules/overview/nav.adoc - modules/install/nav.adoc diff --git a/docs/modules/install/pages/install/srcpkgs/deb.adoc b/docs/modules/install/pages/install/srcpkgs/deb.adoc index 303051ab..80a304c7 100644 --- a/docs/modules/install/pages/install/srcpkgs/deb.adoc +++ b/docs/modules/install/pages/install/srcpkgs/deb.adoc @@ -1,7 +1,7 @@ = Debian Source Packages Slurm-web Debian source packages are available at this URL: -https://pkgs.rackslab.io/deb/pool/main/s/slurm-web +https://pkgs.rackslab.io/deb/pool/{pkgs-derivative}/s/slurm-web Select version of `*.dsc` file at your convenience and copy its URL. @@ -9,7 +9,7 @@ Then run this command, for example with `slurm-web_{version}-1.deb12.dsc`: [source,console,subs=attributes] ---- -$ dget -ux https://pkgs.rackslab.io/deb/pool/main/s/slurm-web/slurm-web_{version}-1.deb12.dsc +$ dget -ux https://pkgs.rackslab.io/deb/pool/{pkgs-derivative}/s/slurm-web/slurm-web_{version}-1.deb12.dsc ---- Move into the source folder: diff --git a/docs/modules/install/pages/install/srcpkgs/rpm.adoc b/docs/modules/install/pages/install/srcpkgs/rpm.adoc index d4989ec5..1026633e 100644 --- a/docs/modules/install/pages/install/srcpkgs/rpm.adoc +++ b/docs/modules/install/pages/install/srcpkgs/rpm.adoc @@ -2,10 +2,10 @@ Slurm-web RPM source packages are available at these URL: -* el8 : https://pkgs.rackslab.io/rpm/el8/main/source/Packages -* el9 : https://pkgs.rackslab.io/rpm/el9/main/source/Packages -* Fedora 39 : https://pkgs.rackslab.io/rpm/fc39/main/source/Packages -* Fedora 40 : https://pkgs.rackslab.io/rpm/fc40/main/source/Packages +* el8 : https://pkgs.rackslab.io/rpm/el8/{pkgs-derivative}/source/Packages +* el9 : https://pkgs.rackslab.io/rpm/el9/{pkgs-derivative}/source/Packages +* Fedora 40 : https://pkgs.rackslab.io/rpm/fc40/{pkgs-derivative}/source/Packages +* Fedora 41 : https://pkgs.rackslab.io/rpm/fc41/{pkgs-derivative}/source/Packages Select version at your convenience and download the `*.src.rpm` file, for example `slurm-web-{version}-1.el8.src.rpm`. diff --git a/docs/modules/install/partials/install/install-apt.adoc b/docs/modules/install/partials/install/install-apt.adoc index df396d7b..e4116096 100644 --- a/docs/modules/install/partials/install/install-apt.adoc +++ b/docs/modules/install/partials/install/install-apt.adoc @@ -1,3 +1,13 @@ +Create preferences file `/etc/apt/preferences.d/rackslab` with this content to +install Slurm-web packages from _{pkgs-derivative}_ component in priority: + +[source,console,subs=attributes] +---- +Package: * +Pin: release c={pkgs-derivative} +Pin-Priority: 900 +---- + Update packages repositories metadata: [source,console] diff --git a/docs/modules/install/partials/install/tabs-deb.adoc b/docs/modules/install/partials/install/tabs-deb.adoc index 3e99fc8c..d20cbdd3 100644 --- a/docs/modules/install/partials/install/tabs-deb.adoc +++ b/docs/modules/install/partials/install/tabs-deb.adoc @@ -1,12 +1,12 @@ Debian 12 _« bookworm »_:: + ==== -[source] +[source,subs=attributes] ---- Types: deb URIs: https://pkgs.rackslab.io/deb Suites: bookworm -Components: main +Components: main {pkgs-derivative} Architectures: amd64 Signed-By: /usr/share/keyrings/rackslab.gpg ---- @@ -15,12 +15,12 @@ Signed-By: /usr/share/keyrings/rackslab.gpg Debian 13 _« trixie »_:: + ==== -[source] +[source,subs=attributes] ---- Types: deb URIs: https://pkgs.rackslab.io/deb Suites: trixie -Components: main +Components: main {pkgs-derivative} Architectures: amd64 Signed-By: /usr/share/keyrings/rackslab.gpg ---- @@ -29,12 +29,12 @@ Signed-By: /usr/share/keyrings/rackslab.gpg Debian unstable _« sid »_:: + ==== -[source] +[source,subs=attributes] ---- Types: deb URIs: https://pkgs.rackslab.io/deb Suites: sid -Components: main +Components: main {pkgs-derivative} Architectures: amd64 Signed-By: /usr/share/keyrings/rackslab.gpg ---- diff --git a/docs/modules/install/partials/install/tabs-el.adoc b/docs/modules/install/partials/install/tabs-el.adoc index 95cb15b1..a06276fb 100644 --- a/docs/modules/install/partials/install/tabs-el.adoc +++ b/docs/modules/install/partials/install/tabs-el.adoc @@ -8,7 +8,7 @@ https://rockylinux.org/[Rocky Linux 8] and https://almalinux.org/[AlmaLinux OS 8]. endif::[] -[source] +[source,subs=attributes] ---- [rackslab] name=Rackslab @@ -17,6 +17,15 @@ gpgcheck=1 enabled=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rackslab + +[rackslab-{pkgs-derivative}] +name=Rackslab {pkgs-derivative} +baseurl=https://pkgs.rackslab.io/rpm/el8/{pkgs-derivative}/$basearch/ +gpgcheck=1 +enabled=1 +countme=1 +priority=90 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rackslab ---- ==== @@ -30,7 +39,7 @@ https://rockylinux.org/[Rocky Linux 9] and https://almalinux.org/[AlmaLinux OS 9]. endif::[] -[source] +[source,subs=attributes] ---- [rackslab] name=Rackslab @@ -39,5 +48,14 @@ gpgcheck=1 enabled=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rackslab + +[rackslab-{pkgs-derivative}] +name=Rackslab {pkgs-derivative} +baseurl=https://pkgs.rackslab.io/rpm/el9/{pkgs-derivative}/$basearch/ +gpgcheck=1 +enabled=1 +countme=1 +priority=90 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rackslab ---- ==== diff --git a/docs/modules/install/partials/install/tabs-fedora.adoc b/docs/modules/install/partials/install/tabs-fedora.adoc index 90274827..e066e9d6 100644 --- a/docs/modules/install/partials/install/tabs-fedora.adoc +++ b/docs/modules/install/partials/install/tabs-fedora.adoc @@ -1,29 +1,47 @@ -Fedora 39:: +Fedora 40:: + ==== -[source] +[source,subs=attributes] ---- [rackslab] name=Rackslab -baseurl=https://pkgs.rackslab.io/rpm/fc39/main/$basearch/ +baseurl=https://pkgs.rackslab.io/rpm/fc40/main/$basearch/ +gpgcheck=1 +enabled=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rackslab + +[rackslab-{pkgs-derivative}] +name=Rackslab +baseurl=https://pkgs.rackslab.io/rpm/fc40/{pkgs-derivative}/$basearch/ gpgcheck=1 enabled=1 countme=1 +priority=90 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rackslab ---- ==== -Fedora 40:: +Fedora 41:: + ==== -[source] +[source,subs=attributes] ---- [rackslab] name=Rackslab -baseurl=https://pkgs.rackslab.io/rpm/fc40/main/$basearch/ +baseurl=https://pkgs.rackslab.io/rpm/fc41/main/$basearch/ +gpgcheck=1 +enabled=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rackslab + +[rackslab-{pkgs-derivative}] +name=Rackslab +baseurl=https://pkgs.rackslab.io/rpm/fc41/{pkgs-derivative}/$basearch/ gpgcheck=1 enabled=1 countme=1 +priority=90 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rackslab ---- ==== diff --git a/docs/modules/install/partials/install/tabs-ubuntu.adoc b/docs/modules/install/partials/install/tabs-ubuntu.adoc index 67af7cf3..6ad5353b 100644 --- a/docs/modules/install/partials/install/tabs-ubuntu.adoc +++ b/docs/modules/install/partials/install/tabs-ubuntu.adoc @@ -1,12 +1,12 @@ Ubuntu 24.04 LTS:: + ==== -[source] +[source,subs=attributes] ---- Types: deb URIs: https://pkgs.rackslab.io/deb Suites: ubuntu24.04 -Components: main +Components: main {pkgs-derivative} Architectures: amd64 Signed-By: /usr/share/keyrings/rackslab.gpg ----