Skip to content

Commit

Permalink
Attempt at fixing the GH CI after systemd removal from setup scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
cbosdo committed Jan 23, 2025
1 parent e442ce3 commit 83a636c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions testsuite/podman_runner/00_setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [ -z "${UYUNI_VERSION}" ];then
fi

echo "Killing old containers"
containers="deblike_minion rhlike_minion sle_minion opensusessh server controller"
containers="auth_registry buildhost deblike_minion rhlike_minion sle_minion opensusessh server controller"
for i in ${containers};do
sudo -i podman kill ${i}
done
Expand All @@ -23,7 +23,7 @@ for i in ${containers};do
done

echo "Force remove containers"
containers="deblike_minion rhlike_minion sle_minion opensusessh server controller"
containers="auth_registry buildhost deblike_minion rhlike_minion sle_minion opensusessh server controller"
for i in ${containers};do
sudo -i podman rm ${i}
done
Expand Down
5 changes: 5 additions & 0 deletions testsuite/podman_runner/07_start_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
set -xe
src_dir=$(cd $(dirname "$0")/../.. && pwd -P)

setup_pm_path=`sudo -i podman run --rm -ti ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-server-all-in-one-dev:$UYUNI_VERSION sh -c 'rpm -ql spacewalk-setup | grep Setup.pm' | tr -d '\r'`

sudo -i podman run --cap-add AUDIT_CONTROL --rm \
--tmpfs /run \
-v ${src_dir}/schema/spacewalk/spacewalk-schema-upgrade:/usr/bin/spacewalk-schema-upgrade \
Expand All @@ -18,6 +20,9 @@ sudo -i podman run --cap-add AUDIT_CONTROL --rm \
-v ${src_dir}/spacewalk/setup/share/tomcat_java_opts.conf:/etc/tomcat/conf.d/tomcat_java_opts.conf \
-v ${src_dir}/spacewalk/setup/share/tomcat_java_opts_suse.conf:/etc/tomcat/conf.d/tomcat_java_opts_suse.conf \
-v ${src_dir}/java/conf/default/rhn_taskomatic_daemon.conf:/usr/share/rhn/config-defaults/rhn_taskomatic_daemon.conf \
-v ${src_dir}/spacewalk/uyuni-setup-reportdb/bin/uyuni-setup-reportdb:/usr/bin/uyuni-setup-reportdb \
-v ${src_dir}/spacewalk/setup/bin/spacewalk-setup:/usr/bin/spacewalk-setup \
-v ${src_dir}/spacewalk/setup/lib/Spacewalk/Setup.pm:${setup_pm_path} \
-v /sys/fs/cgroup:/sys/fs/cgroup:rw \
-v /tmp/testing:/tmp \
--cgroupns=host \
Expand Down

0 comments on commit 83a636c

Please sign in to comment.