Skip to content

Commit

Permalink
Merge pull request #840 from praveenkumar/okd_scos
Browse files Browse the repository at this point in the history
Move OKD bundle from FCOS to SCOS
  • Loading branch information
praveenkumar authored Jan 24, 2024
2 parents 0d0b75a + 0b03587 commit aafb996
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
6 changes: 2 additions & 4 deletions createdisk-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,9 @@ function install_additional_packages() {
local vm_ip=$1
shift
if [[ ${BASE_OS} = "fedora-coreos" ]]; then
${SSH} core@${vm_ip} -- 'sudo sed -i -z s/enabled=0/enabled=1/ /etc/yum.repos.d/fedora.repo'
${SSH} core@${vm_ip} -- 'sudo sed -i -z s/enabled=0/enabled=1/ /etc/yum.repos.d/fedora-updates.repo'
${SSH} core@${vm_ip} -- 'sudo sed -i -z s/enabled=0/enabled=1/g /etc/yum.repos.d/centos.repo'
${SSH} core@${vm_ip} -- "sudo rpm-ostree install --allow-inactive $*"
${SSH} core@${vm_ip} -- 'sudo sed -i -z s/enabled=1/enabled=0/ /etc/yum.repos.d/fedora.repo'
${SSH} core@${vm_ip} -- 'sudo sed -i -z s/enabled=1/enabled=0/ /etc/yum.repos.d/fedora-updates.repo'
${SSH} core@${vm_ip} -- 'sudo sed -i -z s/enabled=1/enabled=0/g /etc/yum.repos.d/centos.repo'
else
# Download the hyperV daemons dependency on host
local pkgDir=$(mktemp -d tmp-rpmXXX)
Expand Down
2 changes: 2 additions & 0 deletions createdisk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ case ${BUNDLE_TYPE} in
;;
okd)
destDirPrefix="crc_${BUNDLE_TYPE}"
# Base OS is not changed for scos-okd because `/proc/cmdline` still contain fedora-coreos
# https://github.com/okd-project/okd-scos/issues/18
BASE_OS=fedora-coreos
;;
snc)
Expand Down
7 changes: 6 additions & 1 deletion snc-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ function download_oc() {
fi
if [ "${SNC_GENERATE_WINDOWS_BUNDLE}" != "0" ]; then
mkdir -p openshift-clients/windows
curl -L "${MIRROR}/${OPENSHIFT_RELEASE_VERSION}/openshift-client-windows-${OPENSHIFT_RELEASE_VERSION}.zip" > openshift-clients/windows/oc.zip
if [ "${BUNDLE_TYPE}" == "okd" ]; then
# hardcode download url for oc client in windows until it is fixed on scos side
curl -L https://github.com/okd-project/okd/releases/download/4.14.0-0.okd-2024-01-06-084517/openshift-client-windows-4.14.0-0.okd-2024-01-06-084517.zip > openshift-clients/windows/oc.zip
else
curl -L "${MIRROR}/${OPENSHIFT_RELEASE_VERSION}/openshift-client-windows-${OPENSHIFT_RELEASE_VERSION}.zip" > openshift-clients/windows/oc.zip
fi
${UNZIP} -o -d openshift-clients/windows/ openshift-clients/windows/oc.zip
fi
}
Expand Down
2 changes: 1 addition & 1 deletion snc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ BUNDLE_TYPE="snc"
if [[ ${OKD_VERSION} != "none" ]]
then
OPENSHIFT_VERSION=${OKD_VERSION}
MIRROR=${MIRROR:-https://github.com/openshift/okd/releases/download}
MIRROR=${MIRROR:-https://github.com/okd-project/okd-scos/releases/download}
BUNDLE_TYPE="okd"
fi

Expand Down

0 comments on commit aafb996

Please sign in to comment.