Skip to content

Commit

Permalink
Updating setup for debug
Browse files Browse the repository at this point in the history
Going back to check epel build here

Signed-off-by: Yariv Rachmani <[email protected]>
  • Loading branch information
Yarboa committed Jan 18, 2024
1 parent e66d909 commit ba4278d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 7 deletions.
11 changes: 6 additions & 5 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ jobs:
identifier: e2e-tiers
tmt_plan: /plans/e2e/tier-0
targets:
epel-9-x86_64:
distros: [centos-stream-9]
- epel-9-x86_64
tf_extra_params:
environments:
- hardware:
Expand All @@ -79,11 +78,13 @@ jobs:
identifier: e2e-ffi
tmt_plan: /plans/e2e/ffi
targets:
epel-9-x86_64:
distros: [centos-stream-9]
- epel-9-x86_64
tf_extra_params:
environments:
- tmt:
- artifacts:
- type: repository-file
id: https://copr.fedorainfracloud.org/coprs/g/centos-automotive-sig/bluechi-snapshot/repo/centos-stream-$releasever-x86_64/
tmt:
context:
scenario : "ffi"
hardware:
Expand Down
11 changes: 11 additions & 0 deletions rpm/qm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,17 @@ sed -i 's/^install: man all/install:/' Makefile
%_format MODULES %{_datadir}/selinux/packages/$x.pp.bz2
%selinux_modules_install -s %{selinuxtype} $MODULES

# Set AllowedCPUs in quadlet file
NPROC=$(nproc)
if [[ $NPROC == 1 ]]; then
ALLOWED_CPUS=0
elif [[ $NPROC == 2 ]]; then
ALLOWED_CPUS=1
else
ALLOWED_CPUS=$(expr $NPROC / 2)"-"$(expr $NPROC - 1)
fi
sed "s/^AllowedCPUs=.*/AllowedCPUs=$ALLOWED_CPUS/" %{_datadir}/containers/systemd/%{name}.container > %{_sysconfdir}/containers/systemd/%{name}.container

%postun
if [ $1 -eq 0 ]; then
%selinux_modules_uninstall -s %{selinuxtype} %{modulenames}
Expand Down
5 changes: 4 additions & 1 deletion setup
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash -e
#! /bin/bash
#
# This setup script will install an OS environment by default into
# /usr/lib/qm/rootfs and create a Podman quadlet containerized environment
Expand Down Expand Up @@ -262,6 +262,9 @@ case "$1" in
if [ "$SYSTEMCTL_SKIP" == "N" ]; then
systemctl daemon-reload
systemctl start qm.service
journalctl -xeu qm.service
ls -laZ /var/lib/containers/
grep -E -v '\#|^$' /etc/containers/storage.conf
else
/usr/libexec/podman/quadlet /run/systemd/generator/
fi
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/set-ffi-env-e2e
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ install_qm_rpms() {
else
dnf copr enable -y "${USE_QM_COPR}" centos-stream-9
fi
dnf install -y bluechi-ctl bluechi-agent bluechi qm podman hostname
dnf install -y bluechi-ctl bluechi-agent podman hostname qm
}

setup_qm_services() {
Expand Down

0 comments on commit ba4278d

Please sign in to comment.