From eb8dd11d98100b3f9ad2b473edd5ae75447caf4c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 2 Oct 2023 09:25:43 -0400 Subject: [PATCH] tests/container: Drop Ignition override These hardcoded package versions just ruin CI. We're unlikely to break this. Eventually what we'll want to do is set up something like a COPR that auto-regenerates "dummy" changes. --- ci/test-container.sh | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/ci/test-container.sh b/ci/test-container.sh index 0308528428..adcb0b2b65 100755 --- a/ci/test-container.sh +++ b/ci/test-container.sh @@ -71,30 +71,7 @@ if ! grep -qFe "not yet implemented" err.txt; then assert_not_reached "unexpected error" fi -# Test overrides -versionid=$(grep -E '^VERSION_ID=' /etc/os-release) -versionid=${versionid:11} # trim off VERSION_ID= -case $versionid in - 38) - url_suffix=2.15.0/4.fc39/x86_64/ignition-2.15.0-4.fc39.x86_64.rpm - # 2.15.0-3 - koji_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2158585" - koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2174317" - kver=6.2.8 - krev=300 - ;; - *) fatal "Unsupported Fedora version: $versionid";; -esac -URL=https://kojipkgs.fedoraproject.org//packages/ignition/$url_suffix -# test replacement by URL -rpm-ostree override replace $URL -rpm-ostree override remove ignition -# test local RPM install -curl -Lo ignition.rpm $URL -rpm-ostree install ignition.rpm -rpm -q ignition - -# And verify it's uninstalled +# Verify dnf wrapper dnf -y uninstall kexec-tools if rpm -q kexec-tools; then fatal "failed to remove kexec-tools"; fi