From 52895bb7a88210219492fc250c1988f9df4404ad Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Sun, 7 Apr 2024 13:36:02 -0700 Subject: [PATCH] define and canonicalize correct format of LOCATION run variable --- VARIABLES.md | 2 +- lib/anaconda.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VARIABLES.md b/VARIABLES.md index d036b977..7e34fc5f 100644 --- a/VARIABLES.md +++ b/VARIABLES.md @@ -107,6 +107,6 @@ These variables should be set when tests are scheduled (when running `isos post` | `PREVREL` | the previous stable Rocky release at the time of the test run | | `UP1REL` | the source release for "1-release" upgrade tests (usually but not always same as `CURRREL`) | | `UP2REL` | the source release for "2-release" upgrade tests (currently always same as `PREVREL`) | -| `LOCATION` | Rocky doesn't replicate compose process used by upstream distribution. `LOCATION` has three general use cases: substitution value for `REPOSITORY_VARIATION` or `REPOSITORY_GRAPHICAL` in `templates.fif.json`, within `utils.pm` in `_repo_setup_compose` which is not valid for Rocky and within `support_server.pm` in `_pxe_setup` to pull the kernel and initrd used for PXE installs. | +| `LOCATION` | Rocky doesn't replicate compose process used by upstream distribution. `LOCATION` has three general use cases: substitution value for `REPOSITORY_VARIATION` or `REPOSITORY_GRAPHICAL` in `templates.fif.json`, within `utils.pm` in `_repo_setup_compose` which is not valid for Rocky and within `support_server.pm` in `_pxe_setup` to pull the kernel and initrd used for PXE installs. Required value is repository URL prefix, eg. `https://download.rockylinux.org/pub/rocky/8/`. | | `DNF_CONTENTDIR` | the value to change `/etc/dnf/vars/contentdir` to (eg. `stg/rocky`) allowing repository reconfiguration to point at staging (usually but not always used with `DNF_RELEASEVER`) | | `DNF_RELEASEVER` | the value to change `/etc/dnf/vars/releasever` to (eg. `8.8-Beta`) allowing repository reconfiguration to point at a specific release (usually but not always used with `DNF_CONTENTDIR`) | diff --git a/lib/anaconda.pm b/lib/anaconda.pm index 59d509a7..f73dc652 100644 --- a/lib/anaconda.pm +++ b/lib/anaconda.pm @@ -366,9 +366,9 @@ sub get_full_repo { # repo URL with flavor and arch, leave hd & NFS ones alone # (as for those tests we just use a mounted ISO and URL is complete) if ($repourl !~ m/^(nfs|hd:)/) { - # Everything variant doesn't exist for modular composes atm, - # only Server - $repourl .= "/" . get_var("ARCH") . "/os"; + # Rocky Linux default repo is BaseOS. This subdirectory + # should be added to ${LOCATION}. + $repourl .= "/BaseOS/" . get_var("ARCH") . "/os"; } return $repourl; }