testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-12-18 09:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

define and canonicalize correct format of LOCATION run variable

Browse Source
This commit is contained in:
Trevor Cooper 2024-04-07 13:36:02 -07:00
parent b9ad97dce5
commit 52895bb7a8
Signed by: tcooper
GPG Key ID: 52364D7BBCEB35B8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VARIABLES.md
View File

@ -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 | | `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`) | | `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`) | | `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_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`) | | `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`) |

6
lib/anaconda.pm
View File

@ -366,9 +366,9 @@ sub get_full_repo {
# repo URL with flavor and arch, leave hd & NFS ones alone # 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) # (as for those tests we just use a mounted ISO and URL is complete)
if ($repourl !~ m/^(nfs|hd:)/) { if ($repourl !~ m/^(nfs|hd:)/) {
# Everything variant doesn't exist for modular composes atm, # Rocky Linux default repo is BaseOS. This subdirectory
# only Server # should be added to ${LOCATION}.
$repourl .= "/" . get_var("ARCH") . "/os"; $repourl .= "/BaseOS/" . get_var("ARCH") . "/os";
} }
return $repourl; return $repourl;
} }