diff --git a/.github/actions/quick-rpm-clean/action.yaml b/.github/actions/quick-rpm-clean/action.yaml index d58e249e..4eba32c4 100644 --- a/.github/actions/quick-rpm-clean/action.yaml +++ b/.github/actions/quick-rpm-clean/action.yaml @@ -66,9 +66,9 @@ runs: env TAG="${{ inputs.install-tag }}" \ bash -xeuo pipefail < ./src/quickrpm.sh - # Restart the greenboot service synchronously to check the health of the system. - # The command exits with the status of the service. - sudo podman exec -i microshift-okd systemctl restart greenboot-healthcheck.service + # Run the 'microshift healthcheck' command to check the health of the system. + # The command exits with the status of the healthcheck procedure. + sudo podman exec -i microshift-okd microshift healthcheck -v=2 --timeout=600s - name: Verify LVM volume group is recreated on restart shell: bash @@ -80,9 +80,9 @@ runs: sudo podman exec -i microshift-okd vgremove myvg1 sudo podman exec -i microshift-okd systemctl start microshift.service - # Restart the greenboot service synchronously to check the health of the system. - # The command exits with the status of the service. - sudo podman exec -i microshift-okd systemctl restart greenboot-healthcheck.service + # Run the 'microshift healthcheck' command to check the health of the system. + # The command exits with the status of the healthcheck procedure. + sudo podman exec -i microshift-okd microshift healthcheck -v=2 --timeout=600s - name: Run the quick clean script if: ${{ inputs.run-clean == 'true' }} diff --git a/.github/workflows/builders.yaml b/.github/workflows/builders.yaml index e3f27d64..b9f4069e 100644 --- a/.github/workflows/builders.yaml +++ b/.github/workflows/builders.yaml @@ -65,7 +65,7 @@ jobs: ushift-gitref: main okd-version-tag: ${{ steps.detect-okd-version.outputs.okd-version-tag }} bootc-image-url: registry.fedoraproject.org/fedora-bootc - bootc-image-tag: 42 + bootc-image-tag: latest node-count: 2 ubuntu-rpm2deb: diff --git a/.github/workflows/installers.yaml b/.github/workflows/installers.yaml index 8bb4ab47..d477162d 100644 --- a/.github/workflows/installers.yaml +++ b/.github/workflows/installers.yaml @@ -37,7 +37,7 @@ jobs: uses: ./.github/actions/quick-rpm-clean with: bootc-image-url: registry.fedoraproject.org/fedora-bootc - bootc-image-tag: 42 + bootc-image-tag: latest - name: Run the quick RPM installation and clean scripts (CentOS 10) uses: ./.github/actions/quick-rpm-clean diff --git a/packaging/bootc.Containerfile b/packaging/bootc.Containerfile index 7b358106..53b17ef1 100644 --- a/packaging/bootc.Containerfile +++ b/packaging/bootc.Containerfile @@ -39,10 +39,6 @@ RUN ${REPO_CONFIG_SCRIPT} -create ${USHIFT_RPM_REPO_PATH} && \ rm -rvf ${USHIFT_RPM_REPO_PATH} && \ dnf clean all -# Pin the greenboot package to 0.15.z until the following issue is resolved: -# https://github.com/fedora-iot/greenboot-rs/issues/132 -RUN dnf install -y 'greenboot-0.15.*' && dnf clean all - # Post-install MicroShift configuration COPY --chmod=755 ./src/rpm/postinstall.sh ${USHIFT_POSTINSTALL_SCRIPT} RUN ${USHIFT_POSTINSTALL_SCRIPT} && rm -vf "${USHIFT_POSTINSTALL_SCRIPT}" diff --git a/packaging/rpms-copr.Containerfile b/packaging/rpms-copr.Containerfile index c0965396..42928e13 100644 --- a/packaging/rpms-copr.Containerfile +++ b/packaging/rpms-copr.Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora:42 +FROM quay.io/fedora/fedora:latest RUN dnf install -y \ --setopt=install_weak_deps=False \ diff --git a/packaging/srpm.Containerfile b/packaging/srpm.Containerfile index 88861d41..82542ed8 100644 --- a/packaging/srpm.Containerfile +++ b/packaging/srpm.Containerfile @@ -1,5 +1,5 @@ # Using Fedora for easy access to the dependencies (no need to install EPEL or use pip) -FROM quay.io/fedora/fedora:42 +FROM quay.io/fedora/fedora:latest RUN dnf install -y \ --setopt=install_weak_deps=False \ diff --git a/src/config_isolated_net.sh b/src/config_isolated_net.sh index 39ae2b56..eb944582 100755 --- a/src/config_isolated_net.sh +++ b/src/config_isolated_net.sh @@ -64,8 +64,6 @@ fi systemctl restart NetworkManager wait_for_network_manager -# Restart the MicroShift and Greenboot services +# Enable and restart the MicroShift service systemctl enable microshift -for unit in microshift greenboot-healthcheck ; do - systemctl restart --no-block ${unit} -done +systemctl restart --no-block microshift diff --git a/src/copr/copr-cli.Containerfile b/src/copr/copr-cli.Containerfile index 6a00140e..3338d9bc 100644 --- a/src/copr/copr-cli.Containerfile +++ b/src/copr/copr-cli.Containerfile @@ -1,3 +1,3 @@ -FROM quay.io/fedora/fedora:42 +FROM quay.io/fedora/fedora:latest RUN dnf install -y copr-cli && dnf clean all diff --git a/src/quickrpm.sh b/src/quickrpm.sh index e06ec819..55952233 100755 --- a/src/quickrpm.sh +++ b/src/quickrpm.sh @@ -79,10 +79,6 @@ function install_rpms() { dnf install -y --setopt=install_weak_deps=False \ microshift microshift-kindnet microshift-topolvm "${WORKDIR}/create_repos.sh" -delete - - # Pin the greenboot package to 0.15.z until the following issue is resolved: - # https://github.com/fedora-iot/greenboot-rs/issues/132 - dnf install -y 'greenboot-0.15.*' } function prepare_lvm_disk() {