Skip to content

Commit e6e743c

Browse files
committed
Switch to latest-4.14 for microshift/ocp and image patches
1 parent a1eac3b commit e6e743c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build-patched-kao-kcmo-images.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ function check_pull_secret() {
3838
check_pull_secret
3939

4040
HOST_ARCH=$(uname -m)
41-
MIRROR=${MIRROR:-https://mirror.openshift.com/pub/openshift-v4/$HOST_ARCH/clients/ocp-dev-preview}
41+
MIRROR=${MIRROR:-https://mirror.openshift.com/pub/openshift-v4/$HOST_ARCH/clients/ocp}
4242

4343
# If user defined the OPENSHIFT_VERSION environment variable then use it.
4444
if test -n "${OPENSHIFT_VERSION-}"; then
4545
OPENSHIFT_RELEASE_VERSION=${OPENSHIFT_VERSION}
4646
echo "Using release ${OPENSHIFT_RELEASE_VERSION} from OPENSHIFT_VERSION"
4747
else
48-
OPENSHIFT_RELEASE_VERSION="$(curl -L "${MIRROR}"/candidate-${OCP_VERSION}/release.txt | sed -n 's/^ *Version: *//p')"
48+
OPENSHIFT_RELEASE_VERSION="$(curl -L "${MIRROR}"/latest-${OCP_VERSION}/release.txt | sed -n 's/^ *Version: *//p')"
4949
if test -n "${OPENSHIFT_RELEASE_VERSION}"; then
5050
echo "Using release ${OPENSHIFT_RELEASE_VERSION} from the mirror"
5151
else

microshift.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function configure_host {
6464

6565
function enable_repos {
6666
sudo subscription-manager repos \
67-
--enable rhocp-4.13-for-rhel-9-$(uname -i)-rpms \
67+
--enable rhocp-4.14-for-rhel-9-$(uname -i)-rpms \
6868
--enable fast-datapath-for-rhel-9-$(uname -i)-rpms
6969
}
7070

@@ -86,7 +86,7 @@ function create_iso {
8686
if [ -n "${MICROSHIFT_PRERELEASE-}" ]; then
8787
git clone -b main https://github.com/openshift/microshift.git
8888
else
89-
git clone -b release-4.13 https://github.com/openshift/microshift.git
89+
git clone -b release-4.14 https://github.com/openshift/microshift.git
9090
fi
9191
cp podman_changes.ks microshift/
9292
pushd microshift

snc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if test -n "${OPENSHIFT_VERSION-}"; then
4444
OPENSHIFT_RELEASE_VERSION=${OPENSHIFT_VERSION}
4545
echo "Using release ${OPENSHIFT_RELEASE_VERSION} from OPENSHIFT_VERSION"
4646
else
47-
OPENSHIFT_RELEASE_VERSION="$(curl -L "${MIRROR}"/candidate-4.14/release.txt | sed -n 's/^ *Version: *//p')"
47+
OPENSHIFT_RELEASE_VERSION="$(curl -L "${MIRROR}"/latest-4.14/release.txt | sed -n 's/^ *Version: *//p')"
4848
if test -n "${OPENSHIFT_RELEASE_VERSION}"; then
4949
echo "Using release ${OPENSHIFT_RELEASE_VERSION} from the latest mirror"
5050
else

0 commit comments

Comments
 (0)