Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/actions/quick-rpm-clean/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/builders.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/installers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions packaging/bootc.Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion packaging/rpms-copr.Containerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion packaging/srpm.Containerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
6 changes: 2 additions & 4 deletions src/config_isolated_net.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/copr/copr-cli.Containerfile
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions src/quickrpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down