Merge pull request #5762 from joepvd/solidify-golang-repos

Solidify repositories for rhel9 golang builder
openshift-eng · Dec 5, 2024 · 6c23478 · 6c23478
2 parents 971a316 + 2523f6f
commit 6c23478
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/group.yml b/group.yml
@@ -36,7 +36,7 @@ repos:
     conf:
       extra_options:
         module_hotfixes: 1
-        includepkgs: module-build-macros golang*
+        includepkgs: module-build-macros golang* goversioninfo
       baseurl:
         aarch64: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/aarch64/
         ppc64le: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/ppc64le/
@@ -50,29 +50,6 @@ repos:
       s390x: rhocp-{MAJOR}.{MINOR}-for-rhel-9-s390x-rpms
       optional: true
 
-  rhel-9-server-ose-build-rpms:
-    conf:
-      extra_options:
-        module_hotfixes: 1
-        # this repo is for our own buildroot, which also inherits a complete RHEL 9 build env;
-        # restrict to specific necessary content, because RHEL 9 build dev content may include
-        # pending unreleased content that can cause conflicts for later CI installs lacking access
-        # to that content.
-        includepkgs: goversioninfo gpgme-devel libassuan-devel mingw* golang*
-      baseurl:
-        aarch64: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/aarch64/
-        ppc64le: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/ppc64le/
-        s390x: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/s390x/
-        x86_64: https://download-node-02.eng.bos.redhat.com/brewroot/repos/rhaos-{MAJOR}.{MINOR}-rhel-9-build/latest/x86_64/
-
-    # These content sets are not used, so just putting something here
-    content_set:
-      default: rhocp-{MAJOR}.{MINOR}-for-rhel-9-x86_64-rpms
-      aarch64: rhocp-{MAJOR}.{MINOR}-for-rhel-9-aarch64-rpms
-      ppc64le: rhocp-{MAJOR}.{MINOR}-for-rhel-9-ppc64le-rpms
-      s390x: rhocp-{MAJOR}.{MINOR}-for-rhel-9-s390x-rpms
-      optional: true
-
   rhel-9-baseos-rpms:
     conf:
       baseurl:
@@ -102,3 +79,18 @@ repos:
       s390x: rhel-9-for-s390x-appstream-eus-rpms__9_DOT_4
     reposync:
       enabled: false
+
+  rhel-9-codeready-builder-rpms:
+    conf:
+      baseurl:
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/aarch64/codeready-builder/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/ppc64le/codeready-builder/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/s390x/codeready-builder/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/x86_64/codeready-builder/os/
+    content_set:
+      default: codeready-builder-for-rhel-9-x86_64-eus-rpms__9_DOT_4
+      aarch64: codeready-builder-for-rhel-9-aarch64-eus-rpms__9_DOT_4
+      ppc64le: codeready-builder-for-rhel-9-ppc64le-eus-rpms__9_DOT_4
+      s390x: codeready-builder-for-rhel-9-s390x-eus-rpms__9_DOT_4
+    reposync:
+      enabled: false
diff --git a/images/openshift-golang-builder.yml b/images/openshift-golang-builder.yml
@@ -13,11 +13,11 @@ content:
       path: go_wrapper.sh
       overwriting: true
 enabled_repos:
-- rhel-9-server-ose-build-rpms
 - rhel-9-baseos-rpms
 - rhel-9-golang-rpms
 # for clang
 - rhel-9-appstream-rpms
+- rhel-9-codeready-builder-rpms
 
 from:
   stream: rhel9