diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl index 9d3bb0f87..fd4ba4aef 100644 --- a/scripts/build/Dockerfile.fedora.tmpl +++ b/scripts/build/Dockerfile.fedora.tmpl @@ -1,5 +1,8 @@ ARG CC=gcc +# FIXME: Temporary solution for https://github.com/checkpoint-restore/criu/issues/1696 +ENV GLIBC_TUNABLES=glibc.pthread.rseq=0 + COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh RUN /bin/prepare-for-fedora-rawhide.sh diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh index 096f907fb..bf7331142 100755 --- a/scripts/ci/run-ci-tests.sh +++ b/scripts/ci/run-ci-tests.sh @@ -235,7 +235,12 @@ if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting make -C test/others/shell-job/ run fi -make -C test/others/rpc/ run + +# FIXME: rpc tests fail even with set glibc tunable +# https://github.com/checkpoint-restore/criu/issues/1696 +if [ "$GLIBC_TUNABLES" != "glibc.pthread.rseq=0" ]; then + make -C test/others/rpc/ run +fi ./test/zdtm.py run -t zdtm/static/env00 --sibling