USHIFT-6718: Update package sources files

Author: pacevedom

test/kickstart-templates/includes/post-cos9rpm.cfg

@@ -22,12 +22,14 @@ EOF
 # openshift-client and crio from OpenShift Mirror.
 # Excludes all to avoid unintentionally sourcing packages from here that
 # should come from a centos repos.
-OCPVERSION=4.REPLACE_MINOR_VERSION
+OCPMAJOR=REPLACE_MAJOR_VERSION
+OCPMINOR=REPLACE_MINOR_VERSION
+OCPVERSION="${OCPMAJOR}.${OCPMINOR}"
 OCPREPO="openshift-${OCPVERSION}-mirror"
 cat > "/etc/yum.repos.d/${OCPREPO}.repo" <<EOF
 [${OCPREPO}]
 name=Openshift ${OCPVERSION} Mirror
-baseurl="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/${OCPVERSION}-el9-beta/"
+baseurl="https://mirror.openshift.com/pub/openshift-v${OCPMAJOR}/$(uname -m)/dependencies/rpms/${OCPVERSION}-el9-beta/"
 gpgcheck=0
 enabled=1
 EOF

test/package-sources/rhocp-y.toml

@@ -1,8 +1,8 @@
 {{- if env.Getenv "RHOCP_MINOR_Y" "" -}}
 id = "rhocp-y"
-name = "Red Hat OpenShift Container Platform 4.{{ .Env.RHOCP_MINOR_Y }} for RHEL 9"
+name = "Red Hat OpenShift Container Platform {{ .Env.RHOCP_MAJOR_Y }}.{{ .Env.RHOCP_MINOR_Y }} for RHEL 9"
 type = "yum-baseurl"
-url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y }}/os"
+url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/{{ .Env.RHOCP_MAJOR_Y }}.{{ .Env.RHOCP_MINOR_Y }}/os"
 # Reenable GPG check when build platform switches to RHEL 9.8
 check_gpg = false
 check_ssl = true

test/package-sources/rhocp-y1.toml

@@ -1,8 +1,8 @@
 {{- if env.Getenv "RHOCP_MINOR_Y1" "" -}}
 id = "rhocp-y1"
-name = "Red Hat OpenShift Container Platform 4.{{ .Env.RHOCP_MINOR_Y1 }} for RHEL 9"
+name = "Red Hat OpenShift Container Platform {{ .Env.RHOCP_MAJOR_Y1 }}.{{ .Env.RHOCP_MINOR_Y1 }} for RHEL 9"
 type = "yum-baseurl"
-url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y1 }}/os"
+url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/{{ .Env.RHOCP_MAJOR_Y1 }}.{{ .Env.RHOCP_MINOR_Y1 }}/os"
 # Reenable GPG check when build platform switches to RHEL 9.8
 check_gpg = false
 check_ssl = true

test/package-sources/rhocp-y2.toml

@@ -1,8 +1,8 @@
 {{- if env.Getenv "RHOCP_MINOR_Y2" "" -}}
 id = "rhocp-y2"
-name = "Red Hat OpenShift Container Platform 4.{{ .Env.RHOCP_MINOR_Y2 }} for RHEL 9"
+name = "Red Hat OpenShift Container Platform {{ .Env.RHOCP_MAJOR_Y2 }}.{{ .Env.RHOCP_MINOR_Y2 }} for RHEL 9"
 type = "yum-baseurl"
-url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y2 }}/os"
+url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/{{ .Env.RHOCP_MAJOR_Y2 }}.{{ .Env.RHOCP_MINOR_Y2 }}/os"
 # Reenable GPG check when build platform switches to RHEL 9.8
 check_gpg = false
 check_ssl = true