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

Fixes related to arm64 #343

Merged
merged 1 commit into from
Feb 16, 2024
Merged

Fixes related to arm64 #343

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ storage() {
"${ROOTFS}/var/lib/shared/overlay-layers/layers.lock"

sed -e '/additionalimage.*/,/]/s/^#//g' \
-e '/additionalimages.*/{n;s|.*|\"\/var\/lib\/shared/\",|}' \
-e '/additionalimages.*/a\"/var\/lib\/shared/\",' \
-e 's|^#.*transient_store.*|transient_store=true|g' \
/"${ROOTFS}/usr/share/containers/storage.conf" \
> "${ROOTFS}/etc/containers/storage.conf"
Expand Down
5 changes: 3 additions & 2 deletions tests/e2e/set-ffi-env-e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,9 @@ install_qm_rpms() {
info_message "=============================="
dnf install -y 'dnf-command(config-manager)'
dnf config-manager --set-enabled crb
dnf copr enable -y @centos-automotive-sig/bluechi-snapshot centos-stream-9
if [ -n "${USE_QM_COPR}" ]; then

if [[ -n "${USE_QM_COPR}" && "${USE_QM_COPR}" != "release" ]]; then
dnf copr enable -y @centos-automotive-sig/bluechi-snapshot centos-stream-9
dnf copr enable -y "${USE_QM_COPR}" centos-stream-9
fi
dnf install -y bluechi-ctl bluechi-agent bluechi-controller qm hostname
Expand Down
2 changes: 1 addition & 1 deletion tests/ffi/agent-flood/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ setup_test_containers_in_qm() {
#Prepare quadlet files for testing containers
for ((i=1;i<=NUMBER_OF_NODES;i++)); do
info_message "setup_test_containers_in_qm(): prepare quadlet files for bluechi-tester-${i}.container"
cat >> "/etc/qm/containers/systemd/bluechi-tester-${i}.container" <<EOF
cat > "/etc/qm/containers/systemd/bluechi-tester-${i}.container" <<EOF
[Unit]
Description=bluechi-tester-X
After=local-fs.target
Expand Down
7 changes: 6 additions & 1 deletion tests/ffi/common/prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ prepare_test() {
fi
# FIXME: QM is failing to start run podman #297 on asil space
exec_cmd "restorecon -RFv /var/lib/containers &> /tmp/asil-restorecon"
# FIXME: oom killer not triggerd for qm processes
# Changing QM score to 1000 to avoid full memory error on SoC
if [[ -n "${PACKIT_COPR_PROJECT}" && "${PACKIT_COPR_PROJECT}" == "release" ]]; then
exec_cmd "sed -i 's|OOMScoreAdjust.*|OOMScoreAdjust=1000|' ${qm_service_file}"
fi
}

disk_cleanup() {
Expand All @@ -43,7 +48,7 @@ prepare_images() {
exec_cmd "mkdir -p ${QM_HOST_REGISTRY_DIR}"
exec_cmd "podman push ${image_id} dir:${QM_HOST_REGISTRY_DIR}/tools-ffi:latest"
# Remove image to save /var space
exec_cmd "podman image rm ${image_id}"
exec_cmd "podman image rm -f ${image_id}"
fi
}

Expand Down
Loading