From ab99fdc8c847d4ecfecc9e168fdd7ce6efeef965 Mon Sep 17 00:00:00 2001 From: Al Bowles Date: Mon, 10 Jul 2023 09:21:09 -0500 Subject: [PATCH 1/2] Document repocompare process --- docs/sop/.pages | 1 + docs/sop/sop_repocompare.md | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 docs/sop/sop_repocompare.md diff --git a/docs/sop/.pages b/docs/sop/.pages index 3d19078..dfb1504 100644 --- a/docs/sop/.pages +++ b/docs/sop/.pages @@ -4,4 +4,5 @@ nav: - 'SOP: openQA Operator Access Request': 'openqa_sop_operator_access.md' - 'SOP: openQA Operator Access Removal': 'openqa_sop_operator_removal.md' - 'SOP: openQA System Upgrades': 'openqa_sop_system_upgrades.md' + - 'SOP: Repocompare': 'sop_repocompare.md' ... diff --git a/docs/sop/sop_repocompare.md b/docs/sop/sop_repocompare.md new file mode 100644 index 0000000..cda70d7 --- /dev/null +++ b/docs/sop/sop_repocompare.md @@ -0,0 +1,45 @@ +--- +title: 'SOP: Repocompare' +--- + +This SOP covers how to perform the repocompare process, to ensure that Rocky's package repositories are up-to-date with the RHEL package repositories. + +{% include "contacts_top.md" %} + +To identify which packages may need updates, visit the appropriate [RepoCompare](https://repocompare.rockylinux.org) page, focusing on the **SRPM Repo Comparison** page for each version. +Packages where the **Rocky** version is **lower** than the **RHEL** version likely require an update - you can do a manual comparison to be sure. + +## Setup + +From a **RHEL8 machine with a valid entitlement**, obtain the repocompare repository: + + git clone https://git.resf.org/testing/repocompare + cd repocompare/ + +Import the RPM GPG keys for both Rocky and RHEL + + curl -O http://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-8 + curl -O http://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9 + rpm --import RPM-GPG-KEY-Rocky-8 + rpm --import RPM-GPG-KEY-Rocky-9 + rpm --import /etc/pki/rpm-gpg/redhat-official + +## Comparing a package + +If the Name/Epoch/Version/Release (NEVR) for the RHEL package is newer than the one for the Rocky package, the package requires an update. In this situation, there will also likely be a newer entry in the changelog for the RHEL package, as shown below: + + ./manual_compare.sh 9 AppStream golang + Rocky Linux 9.2 golang 1.19.9 2.el9_2 * Tue May 23 2023 Alejandro Sáez - 1.19.9-2 + Red Hat golang 1.19.10 1.el9_2 * Tue Jun 06 2023 David Benoit - 1.19.10-1 + +Notice that the Red Hat golang package has a higher version than the Rocky Linux 9.2 package. It also has a newer entry in its changelog. + +## Gotchas + +Some packages are not considered relevant for repocompare purposes. These include: + + rhc + shim-unsigned + # Any package that exists in RHEL but not in Rocky (denoted by **DOES NOT EXIST** in the Rocky column on the repocompare website) + +{% include "content_bottom.md" %} From a7a99e07561d27f9115624e4b3e2f5b06c1b172c Mon Sep 17 00:00:00 2001 From: Al Bowles Date: Tue, 15 Aug 2023 17:47:23 -0500 Subject: [PATCH 2/2] Address @tcooper's feedback --- docs/sop/sop_repocompare.md | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/docs/sop/sop_repocompare.md b/docs/sop/sop_repocompare.md index cda70d7..c015389 100644 --- a/docs/sop/sop_repocompare.md +++ b/docs/sop/sop_repocompare.md @@ -6,31 +6,37 @@ This SOP covers how to perform the repocompare process, to ensure that Rocky's p {% include "contacts_top.md" %} -To identify which packages may need updates, visit the appropriate [RepoCompare](https://repocompare.rockylinux.org) page, focusing on the **SRPM Repo Comparison** page for each version. +To identify which packages may need updates, visit the appropriate [RepoCompare](https://repocompare.rockylinux.org){target=_blank} page, focusing on the **SRPM Repo Comparison** page for each version. Packages where the **Rocky** version is **lower** than the **RHEL** version likely require an update - you can do a manual comparison to be sure. ## Setup From a **RHEL8 machine with a valid entitlement**, obtain the repocompare repository: - git clone https://git.resf.org/testing/repocompare - cd repocompare/ +``` bash linenums="1" +git clone https://git.resf.org/testing/repocompare +cd repocompare/ +``` Import the RPM GPG keys for both Rocky and RHEL - curl -O http://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-8 - curl -O http://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9 - rpm --import RPM-GPG-KEY-Rocky-8 - rpm --import RPM-GPG-KEY-Rocky-9 - rpm --import /etc/pki/rpm-gpg/redhat-official +``` bash linenums="1" +curl -O http://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-8 +curl -O http://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9 +rpm --import RPM-GPG-KEY-Rocky-8 +rpm --import RPM-GPG-KEY-Rocky-9 +rpm --import /etc/pki/rpm-gpg/redhat-official +``` ## Comparing a package If the Name/Epoch/Version/Release (NEVR) for the RHEL package is newer than the one for the Rocky package, the package requires an update. In this situation, there will also likely be a newer entry in the changelog for the RHEL package, as shown below: - ./manual_compare.sh 9 AppStream golang - Rocky Linux 9.2 golang 1.19.9 2.el9_2 * Tue May 23 2023 Alejandro Sáez - 1.19.9-2 - Red Hat golang 1.19.10 1.el9_2 * Tue Jun 06 2023 David Benoit - 1.19.10-1 +``` bash linenums="1" +./manual_compare.sh 9 AppStream golang +Rocky Linux 9.2 golang 1.19.9 2.el9_2 * Tue May 23 2023 Alejandro Sáez - 1.19.9-2 +Red Hat golang 1.19.10 1.el9_2 * Tue Jun 06 2023 David Benoit - 1.19.10-1 +``` Notice that the Red Hat golang package has a higher version than the Rocky Linux 9.2 package. It also has a newer entry in its changelog. @@ -38,8 +44,10 @@ Notice that the Red Hat golang package has a higher version than the Rocky Linux Some packages are not considered relevant for repocompare purposes. These include: - rhc - shim-unsigned - # Any package that exists in RHEL but not in Rocky (denoted by **DOES NOT EXIST** in the Rocky column on the repocompare website) +``` bash linenums="1" +rhc +shim-unsigned +# Any package that exists in RHEL but not in Rocky (denoted by **DOES NOT EXIST** in the Rocky column on the repocompare website) +``` {% include "content_bottom.md" %}