diff --git a/docs/devenv_setup.md b/docs/devenv_setup.md index d23470261c..f2c2dff6f4 100644 --- a/docs/devenv_setup.md +++ b/docs/devenv_setup.md @@ -119,22 +119,11 @@ When working with MicroShift based on a pre-release _minor_ version `Y` of OpenS ```bash OSVERSION=$(awk -F: '{print $5}' /etc/system-release-cpe) -OCP_REPO_NAME=rhocp-4.13-for-rhel-${OSVERSION}-mirrorbeta-$(uname -m)-rpms - -sudo tee /etc/yum.repos.d/${OCP_REPO_NAME}.repo >/dev/null <
CentOS diff --git a/docs/rhel4edge_iso.md b/docs/rhel4edge_iso.md index b83b53358b..cfe35078fc 100644 --- a/docs/rhel4edge_iso.md +++ b/docs/rhel4edge_iso.md @@ -134,17 +134,6 @@ auth_file_path = "/etc/osbuild-worker/pull-secret.json" EOF ``` -> **NOTE**
-> Embedding container images in the generated ISO requires the functionality from the latest version of the `osbuild` and `osbuild-composer` packages. -> This functionality will be available in the future releases of the RHEL 9 operating system. - -To install the necessary functionality, run the following command to upgrade your system with the up-to-date software from the `copr` repository. -```bash -~/microshift/hack/osbuild2copr.sh copr -``` - -> If necessary, rerun the `hack/osbuild2copr.sh` script with the `appstream` argument to revert to the standard `osbuild` and `osbuild-composer` packages. - Proceed by running the build script with the `-embed_containers` argument to include the dependent container images into the generated ISO. ```bash ~/microshift/scripts/image-builder/build.sh -pull_secret_file ~/.pull-secret.json -embed_containers @@ -362,23 +351,10 @@ curl: (6) Could not resolve host: redhat.com > * Run the `sudo systemctl enable --now serial-getty@ttyS0.service` command on the virtual machine to enable the serial console service. > * Run the `sudo virsh console microshift-edge` command on the hypervisor to connect to the serial console. -Make sure that `CRI-O` has access to all the container images required by MicroShift. +Make sure that `CRI-O` has access to the container images required by MicroShift. ```bash -$ sudo crictl images -IMAGE TAG IMAGE ID SIZE -quay.io/openshift-release-dev/ocp-v4.0-art-dev abfe4b141323c 400MB -quay.io/openshift-release-dev/ocp-v4.0-art-dev latest e838beef2dc33 352MB -quay.io/openshift-release-dev/ocp-v4.0-art-dev 46485ef27b75a 354MB -quay.io/openshift-release-dev/ocp-v4.0-art-dev c9ab25a51ced3 331MB -quay.io/openshift-release-dev/ocp-v4.0-art-dev 075ed082f7130 343MB -quay.io/openshift-release-dev/ocp-v4.0-art-dev d9ab25a51c123 415MB -quay.io/openshift-release-dev/ocp-v4.0-art-dev 075eabc2f7a0a 466MB -registry.access.redhat.com/ubi8/openssl latest 6f0b85db494c0 40.7MB -registry.redhat.io/odf4/odf-topolvm-rhel8 latest 7772af7c5ac84 222MB -registry.redhat.io/openshift4/ose-csi-external-provisioner latest f4f57fec63a30 389MB -registry.redhat.io/openshift4/ose-csi-external-resizer latest ffee6b6e833e3 387MB -registry.redhat.io/openshift4/ose-csi-livenessprobe latest f67b4438d40d3 349MB -registry.redhat.io/openshift4/ose-csi-node-driver-registrar latest 161662e2189a0 350MB +$ sudo crictl images | egrep -c 'openshift|redhat' +13 ``` Finally, wait until all the MicroShift pods are up and running. diff --git a/hack/osbuild2copr.sh b/hack/osbuild2copr.sh deleted file mode 100755 index 5848b79c22..0000000000 --- a/hack/osbuild2copr.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -set -e - -ROOTDIR=$(dirname "$0") - -COPR_MODE= -case "$1" in -copr) - COPR_MODE=enable - ;; -appstream) - COPR_MODE=disable - ;; -*) - echo "Usage: $(basename "$0") " - exit 1 - ;; -esac - -echo "Removing the existing 'osbuild' packages..." -LIST2REMOVE=$(rpm -qa | grep -E '^osbuild' || true) -# shellcheck disable=SC2086 -# The list need not be quoted to allow multiple package removal -[ -n "${LIST2REMOVE}" ] && sudo dnf remove -y ${LIST2REMOVE} - -# Clean-up the old osbuild jobs, state and copr packages to avoid incompatibilities between versions -sudo rm -rf /var/lib/osbuild-composer || true -sudo rm -rf /var/cache/{osbuild-composer,osbuild-worker} || true -sudo rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:*osbuild* || true - -sudo dnf copr -y "${COPR_MODE}" @osbuild/osbuild "epel-9-$(uname -m)" -sudo dnf copr -y "${COPR_MODE}" @osbuild/osbuild-composer "epel-9-$(uname -m)" - -# Uncomment the following to use the packages from PRs before their merge -# sudo dnf copr -y "${COPR_MODE}" packit/osbuild-osbuild-1252 "epel-9-$(uname -m)" -# sudo dnf copr -y "${COPR_MODE}" packit/osbuild-osbuild-composer-3398 "epel-9-$(uname -m)" - -echo "Installing new 'osbuild' packages..." -"${ROOTDIR}/../scripts/image-builder/configure.sh" -"${ROOTDIR}/../scripts/image-builder/cleanup.sh" -full - -echo "Querying the installed 'osbuild' packages..." -rpm -qa | grep -E '^osbuild' diff --git a/scripts/devenv-builder/configure-vm.sh b/scripts/devenv-builder/configure-vm.sh index bccab522a5..ee2d0d3042 100755 --- a/scripts/devenv-builder/configure-vm.sh +++ b/scripts/devenv-builder/configure-vm.sh @@ -93,22 +93,11 @@ fi # https://github.com/openshift/microshift/blob/main/docs/devenv_setup.md#runtime-prerequisites if ${RHEL_SUBSCRIPTION}; then OSVERSION=$(awk -F: '{print $5}' /etc/system-release-cpe) - OCP_REPO_NAME=rhocp-4.13-for-rhel-${OSVERSION}-mirrorbeta-$(uname -m)-rpms - - sudo tee "/etc/yum.repos.d/${OCP_REPO_NAME}.repo" >/dev/null </dev/null # Download openshift local RPM packages (noarch for python and selinux packages) rm -rf openshift-local 2>/dev/null || true -OCP_REPO_NAME="rhocp-4.13-for-rhel-${OSVERSION}-mirrorbeta-${BUILD_ARCH}-rpms" + +# TODO: Start using 'rhocp-4.13' repository when OCP 4.13 is released +OCP_REPO_NAME="rhocp-4.12-for-rhel-${OSVERSION}-$(uname -m)-rpms" reposync -n -a "${BUILD_ARCH}" -a noarch --download-path openshift-local \ - --repo="${OCP_REPO_NAME}" >/dev/null -# --repo=fast-datapath-for-rhel-${OSVERSION}-${BUILD_ARCH}-rpms + --repo="${OCP_REPO_NAME}" \ + --repo="fast-datapath-for-rhel-${OSVERSION}-${BUILD_ARCH}-rpms" >/dev/null # Remove 'microshift' packages to avoid overrides from the remote repository find openshift-local -name \*microshift\* -exec rm -f {} \; diff --git a/scripts/image-builder/configure.sh b/scripts/image-builder/configure.sh index d29ad97352..198fb02934 100755 --- a/scripts/image-builder/configure.sh +++ b/scripts/image-builder/configure.sh @@ -3,59 +3,11 @@ set -exo pipefail OSVERSION=$(awk -F: '{print $5}' /etc/system-release-cpe) -function osbuild_rhel9_beta() { - local json_file=$1 - sudo mkdir -p "$(dirname "${json_file}")" - sudo tee "${json_file}" >/dev/null <