Skip to content

Commit

Permalink
Packit failures w/a
Browse files Browse the repository at this point in the history
There connectivity issues between bluechi-controller
and qm-node1 bluechi-agent failing tier-0 tests

Adding --tz local for each container
Disk selinux container cleanup

Signed-off-by: Yariv Rachmani <yrachman@redhat.com>
  • Loading branch information
Yarboa committed Jun 16, 2024
1 parent d2ac2b3 commit 82eb2d3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ jobs:
hardware:
disk:
- size: ">= 20 GB"


- job: tests
trigger: pull_request
identifier: e2e-ffi
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/lib/container
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ file: ${container_file} tag: ${container_tag}"
# Execute the container
eval "$(podman run -d \
--privileged \
--tz local \
--network podmanDualStack \
--name "${container_name}" \
--hostname "${container_name}" \
Expand Down
5 changes: 3 additions & 2 deletions tests/ffi/common/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ prepare_test() {
# Remove 'DropCapability=sys_resource' enable nested container in QM
exec_cmd "sed -i 's|DropCapability=sys_resource|#DropCapability=sys_resource|' \
${qm_service_file}"
exec_cmd "restorecon -RFv /var/lib/containers"
# 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() {
exec_cmd "podman exec qm bash -c \"podman container cleanup -l\""
exec_cmd "systemctl stop qm"
remove_file=$(find /var/qm -size +2G)
exec_cmd "rm -f $remove_file"
exec_cmd "systemctl start qm"
remove_file=$(find /root -size +1G)
exec_cmd "rm -f $remove_file"
exec_cmd "systemctl start qm"
}

reload_config() {
Expand All @@ -41,6 +41,7 @@ prepare_images() {
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 -f ${image_id}"
exec_cmd "restorecon -RFv /var/lib/containers"
fi
}

Expand Down

0 comments on commit 82eb2d3

Please sign in to comment.