Merge pull request #44 from jcapiitao/add_rhel10_repo

COS-3453: get-ocp-repo: pull rhel10 repo

Author: openshift-merge-bot[bot]

ci/get-ocp-repo.sh

@@ -6,8 +6,9 @@ set -euo pipefail
 # content.
 
 urls=(
-    # theoretically that's the only one we need
+    # theoretically that's the only ones we need
     "http://base-4-19-rhel96.ocp.svc.cluster.local"
+    "http://base-4-20-rhel10.ocp.svc.cluster.local"
     # XXX: but also currently add 9.4 repos for crun-wasm when building extensions
     # https://github.com/openshift/os/issues/1680
     # https://github.com/openshift/os/pull/1682
@@ -16,8 +17,15 @@ urls=(
 )
 
 dest=$1; shift
+variant=$1; shift
 
 rm -f "$dest"
 for url in "${urls[@]}"; do
     curl --fail -L "$url" >> "$dest"
 done
+# One OCP release is tied to only one Y release of RHEL, so the ART team finds there is no value
+# specifying a Y stream in PROW. Then we have to add it back here to be consistent with our pipeline.
+# https://github.com/openshift/release/blob/master/core-services/release-controller/_repos/ocp-4.20-rhel10.repo
+if [[ "$variant" == rhel-10* ]]; then
+    sed -i "/^name =/s/rhel-10/$variant/;/^\[.*\]$/s/rhel-10/$variant/" "$dest"
+fi

ci/prow-entrypoint.sh

@@ -56,11 +56,20 @@ cosa_init() {
 
     # Setup source tree
     cosa init --transient --variant "${variant}" "${tmp_src}/os"
+
+    # Pull repos from an in-cluster service of the Openshift CI
+    prepare_repos "${variant}"
 }
 
 # Initialize the .repo files
 prepare_repos() {
-    src/config/ci/get-ocp-repo.sh src/config/ocp.repo
+    if [[ ${#} -ne 1 ]]; then
+        echo "This should have been called with a single 'variant' argument"
+        exit 1
+    fi
+    local -r variant="${1}"
+
+    src/config/ci/get-ocp-repo.sh src/config/ocp.repo "${variant}"
 }
 
 # Do a cosa build only.
@@ -69,7 +78,6 @@ prepare_repos() {
 # We do not build the QEMU image here as we don't need it in the pure container
 # test case.
 cosa_build() {
-    prepare_repos
     # Fetch packages
     cosa fetch
     # Only build the ostree image by default
@@ -236,7 +244,6 @@ main() {
             ;;
         "init")
             cosa_init "$2"
-            prepare_repos
             ;;
         # this is called by cosa's CI
         "rhcos-cosa-prow-pr-ci")

manifest-rhel-10.1.yaml

@@ -13,12 +13,10 @@ variables:
 include:
   - common.yaml
 
-# XXX get rhel 10.1 repos in prow
 repos:
   - rhel-10.1-baseos
   - rhel-10.1-appstream
-  # Early kernel repo not available for now
-  # - rhel-10.1-early-kernel
+  - rhel-10.1-early-kernel
 
 automatic-version-prefix: "10.1.<date:%Y%m%d>"
 # This ensures we're semver-compatible which OpenShift wants