Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kola/kernel-replace: Add OS_ID recogntion #3048

Draft
wants to merge 1 commit into
base: testing-devel
Choose a base branch
from
Draft

kola/kernel-replace: Add OS_ID recogntion #3048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions tests/kola/rpm-ostree/kernel-replace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
## # We've seen some OOM when 1024M is used:
## # https://github.com/coreos/fedora-coreos-tracker/issues/1506
## minMemory: 2048
## # This test only runs on FCOS due to a problem with skopeo copy on
## # RHCOS. See: https://github.com/containers/skopeo/issues/1846
## distros: fcos
## distros: "fcos rhcos scos"
Copy link
Contributor

@jbtrystram jbtrystram Jul 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just omit the tag would work from what i understand ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it? I'm not sure to be completely honest.

## # Needs internet access as we fetch files from koji
## # We add the "reprovision" tag here even though we aren't
## # reprovisioning as a hack so that in our pipeline the test
Expand Down Expand Up @@ -43,10 +41,14 @@ set -euxo pipefail
cd $(mktemp -d)

# TODO: It'd be much better to test this via a registry
image_dir=/var/tmp/fcos
image=oci:$image_dir

# search for a line starting with ID, assign second field after delimiter
OS_ID=$(grep '^ID=' /etc/os-release | cut -d "=" -f2 | cut -d '"' -f2)

image_dir=/var/tmp/coreos
image=oci:${image_dir}
image_pull=ostree-unverified-image:$image
tmp_imagedir=/var/tmp/fcos-tmp
tmp_imagedir=${image_dir}-tmp
arch=$(arch)
kver="6.2.9-300.fc38.${arch}"

Expand Down Expand Up @@ -80,13 +82,13 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
1)
# Setup
# copy the OCI dir to containers-storage for a local build
skopeo copy $image containers-storage:localhost/fcos
skopeo copy $image containers-storage:localhost/${OS_ID}
rm "${image_dir}" -rf
td=$(mktemp -d)
cd ${td}
version=$(rpm-ostree --version | grep Version)
cat > Dockerfile << EOF
FROM localhost/fcos
cat > Containerfile << EOF
FROM localhost/${OS_ID}
RUN rpm-ostree cliwrap install-to-root /
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should drop this now as per openshift/openshift-docs#77066.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to drop this, and replace with the rpm-ostree override replace from centos, but it's failing for now during download. I will get back to it after the weekend.

RUN rpm-ostree override replace \
https://koji.fedoraproject.org/koji/buildinfo?buildID=2178613 && \
Expand All @@ -101,12 +103,12 @@ EOF
3.*) touched_resolv_conf=1; touch /etc/resolv.conf;;
esac
fi
podman build --net=host -t localhost/fcos-derived --squash .
podman build --net=host -t localhost/${OS_ID}-derived --squash .
if test "${touched_resolv_conf}" -eq 1; then
rm -vf /etc/resolv.conf
fi
derived=oci:$image_dir:derived
skopeo copy containers-storage:localhost/fcos-derived $derived
skopeo copy containers-storage:localhost/${OS_ID}-derived $derived
rpm-ostree --version
rpm-ostree rebase ostree-unverified-image:$derived
ostree container image list --repo=/ostree/repo
Expand Down
Loading