From ccf3ba6d1a7525f91251c93dd6dece859cd9d67e Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 5 Jun 2024 12:06:42 -0400 Subject: [PATCH 1/4] contrib/rhcs.md: use HTTPS for pulp URLs The rhsm-pulp server uses an SSL certificate from a public CA, so we can use the HTTPS URLs easily now. Signed-off-by: Ken Dreyer --- contrib/rhcs.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/rhcs.md b/contrib/rhcs.md index 19b9ea804..e9dc94fa4 100644 --- a/contrib/rhcs.md +++ b/contrib/rhcs.md @@ -50,14 +50,14 @@ Next, after the `RUN rm -f /etc/yum.repos.d/ubi.repo` step, add the following by ```Dockerfile RUN printf '[rhel-9-baseos]\n\ name = Red Hat Enterprise Linux 9 BaseOS\n\ -baseurl = http://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/$basearch/baseos/os/\n\ +baseurl = https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/$basearch/baseos/os/\n\ enabled = 1\n\ gpgcheck = 1\n\ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release\n\ \n\ [rhel-9-appstream]\n\ name = Red Hat Enterprise Linux 9 AppStream\n\ -baseurl = http://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/$basearch/appstream/os/\n\ +baseurl = https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/$basearch/appstream/os/\n\ enabled = 1\n\ gpgcheck = 1\n\ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release' >> /etc/yum.repos.d/rhel-9.repo From cf9fbe646f28cbd52c455585e85d735a52af36d3 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 5 Jun 2024 12:07:49 -0400 Subject: [PATCH 2/4] contrib/rhcs.md: new ODCS server Red Hat's ODCS hosts files on a new download server. Signed-off-by: Ken Dreyer --- contrib/rhcs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/rhcs.md b/contrib/rhcs.md index e9dc94fa4..4682c24dc 100644 --- a/contrib/rhcs.md +++ b/contrib/rhcs.md @@ -66,7 +66,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release' >> /etc/yum.repos.d RUN printf '[odcs]\n\ name = odcs\n\ -baseurl = http://download.eng.bos.redhat.com/odcs/prod/odcs-12345678/compose/Temporary/$basearch/os/\n\ +baseurl = http://download-01.beak-001.prod.iad2.dc.redhat.com/odcs/prod/odcs-12345678/compose/Temporary/$basearch/os/\n\ enabled = 1\n\ gpgcheck = 0\n\ ' >> /etc/yum.repos.d/odcs.repo From e72bb7cf671beec5a119dce920a66293943648ac Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 5 Jun 2024 12:09:18 -0400 Subject: [PATCH 3/4] contrib/rhcs.md: add codeready-builder repo Ceph now depends on libprotoc.so.25, which is in RHEL 9's codeready-builder repository. Signed-off-by: Ken Dreyer --- contrib/rhcs.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contrib/rhcs.md b/contrib/rhcs.md index 4682c24dc..bc3cc5e80 100644 --- a/contrib/rhcs.md +++ b/contrib/rhcs.md @@ -60,6 +60,13 @@ name = Red Hat Enterprise Linux 9 AppStream\n\ baseurl = https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/$basearch/appstream/os/\n\ enabled = 1\n\ gpgcheck = 1\n\ +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release\n\ +\n\ +[rhel-9-codeready-builder]\n\ +name = Red Hat Enterprise Linux 9 CRB\n\ +baseurl = https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/$basearch/codeready-builder/os/\n\ +enabled = 1\n\ +gpgcheck = 1\n\ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release' >> /etc/yum.repos.d/rhel-9.repo # Note: use your ODCS compose ID here (replacing "12345678"): From 9cb28b3e8fc31af58616f30b2b4ee836c0e759d1 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 5 Jun 2024 12:08:36 -0400 Subject: [PATCH 4/4] contrib/rhcs.md: use "8" in example commands We're developing RHCS 8 actively. Use the latest version number in the example commands. Signed-off-by: Ken Dreyer --- contrib/rhcs.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/rhcs.md b/contrib/rhcs.md index bc3cc5e80..c71a17451 100644 --- a/contrib/rhcs.md +++ b/contrib/rhcs.md @@ -21,12 +21,12 @@ final `Dockerfile` that developers can build or commit to dist-git. This command generates that downstream Red Hat UBI-based `Dockerfile`: ``` -BRANDING=redhat VERSION=7 ./contrib/compose-rhcs.sh +BRANDING=redhat VERSION=8 ./contrib/compose-rhcs.sh ``` Or the IBM-branded `Dockerfile`: ``` -BRANDING=ibm VERSION=7 ./contrib/compose-rhcs.sh +BRANDING=ibm VERSION=8 ./contrib/compose-rhcs.sh ``` ## Yum repositories @@ -40,7 +40,7 @@ To test a local build outside OSBS, you must mimic what OSBS does and insert som First, create an ODCS compose from the candidate tag: ``` -odcs --redhat create-tag --sigkey none ceph-7.0-rhel-9-candidate +odcs --redhat create-tag --sigkey none ceph-8.0-rhel-9-candidate ``` Save the resulting id and baseurl for the next step.