From 014743c449205f5d9d94f4b1e8a49b2742fe9b10 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Pla Date: Thu, 10 Aug 2023 15:45:42 +0200 Subject: [PATCH 1/2] CI: exit if yarn errors Signed-off-by: Jordi Massaguer Pla --- testsuite/podman_runner/08_build_server_code.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/podman_runner/08_build_server_code.sh b/testsuite/podman_runner/08_build_server_code.sh index ace82a41e6b6..121c619a8e41 100755 --- a/testsuite/podman_runner/08_build_server_code.sh +++ b/testsuite/podman_runner/08_build_server_code.sh @@ -2,7 +2,7 @@ set -xe sudo -i podman exec uyuni-server-all-in-one-test bash -c "cp /testsuite/podman_runner/debug_logging.properties /etc/tomcat/logging.properties" sudo -i podman exec uyuni-server-all-in-one-test bash -c "cd /java && ant -f manager-build.xml ivy refresh-branding-jar deploy-local" -sudo -i podman exec uyuni-server-all-in-one-test bash -c "cd /web/html/src;[ -d dist ] || mkdir dist;yarn install --force --ignore-optional --production=true --frozen-lockfile;yarn autoclean --force;yarn build:novalidate; rsync -a dist/ /srv/www/htdocs/" +sudo -i podman exec uyuni-server-all-in-one-test bash -c "set -xe;cd /web/html/src;[ -d dist ] || mkdir dist;yarn install --force --ignore-optional --production=true --frozen-lockfile;yarn autoclean --force;yarn build:novalidate; rsync -a dist/ /srv/www/htdocs/" sudo -i podman exec uyuni-server-all-in-one-test bash -c "rctomcat restart" From 0fb958dcfc6ea6316a8a00ef9397ca142999439b Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Pla Date: Thu, 10 Aug 2023 18:05:25 +0200 Subject: [PATCH 2/2] CI: force yarn to use ipv4 address Signed-off-by: Jordi Massaguer Pla --- testsuite/podman_runner/06_start_server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/podman_runner/06_start_server.sh b/testsuite/podman_runner/06_start_server.sh index c602972a1305..a79a5fef823b 100755 --- a/testsuite/podman_runner/06_start_server.sh +++ b/testsuite/podman_runner/06_start_server.sh @@ -2,5 +2,5 @@ set -xe src_dir=$(cd $(dirname "$0")/../.. && pwd -P) -sudo -i podman run --rm --tmpfs /run -v ${src_dir}/schema/spacewalk/spacewalk-schema-upgrade:/usr/bin/spacewalk-schema-upgrade -v${src_dir}/testsuite:/testsuite -v ${src_dir}/schema/spacewalk/upgrade/:/etc/sysconfig/rhn/schema-upgrade/ -v ${src_dir}/schema/reportdb/upgrade/:/etc/sysconfig/rhn/reportdb-schema-upgrade/ -v ${src_dir}/web:/web -v ${src_dir}/branding:/branding -v ${src_dir}/java:/java -v /sys/fs/cgroup:/sys/fs/cgroup:rw -v /tmp/test-all-in-one:/tmp --cgroupns=host --add-host=download.opensuse.org:195.135.221.134 -h uyuni-server-all-in-one-test -p 8443:443 -p 8080:80 -p 4505:4505 -p 4506:4506 -d --name=uyuni-server-all-in-one-test --network uyuni-network-1 ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-server-all-in-one-dev:$UYUNI_VERSION +sudo -i podman run --rm --tmpfs /run -v ${src_dir}/schema/spacewalk/spacewalk-schema-upgrade:/usr/bin/spacewalk-schema-upgrade -v${src_dir}/testsuite:/testsuite -v ${src_dir}/schema/spacewalk/upgrade/:/etc/sysconfig/rhn/schema-upgrade/ -v ${src_dir}/schema/reportdb/upgrade/:/etc/sysconfig/rhn/reportdb-schema-upgrade/ -v ${src_dir}/web:/web -v ${src_dir}/branding:/branding -v ${src_dir}/java:/java -v /sys/fs/cgroup:/sys/fs/cgroup:rw -v /tmp/test-all-in-one:/tmp --cgroupns=host --add-host=download.opensuse.org:195.135.221.134 --add-host=registry.npmjs.org:104.16.31.34 --add-host=registry.yarnpkg.com:104.16.29.34 -h uyuni-server-all-in-one-test -p 8443:443 -p 8080:80 -p 4505:4505 -p 4506:4506 -d --name=uyuni-server-all-in-one-test --network uyuni-network-1 ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-server-all-in-one-dev:$UYUNI_VERSION