attempt to make it work in CI

This commit is contained in:
Christian Schwarz
2024-01-25 13:02:30 +00:00
parent bcfd333c98
commit b602063f7f
2 changed files with 11 additions and 4 deletions

View File

@@ -420,7 +420,7 @@ jobs:
container:
image: 369495373322.dkr.ecr.eu-central-1.amazonaws.com/build-tools:${{ needs.build-buildtools-image.outputs.build-tools-tag }}
# Default shared memory is 64mb
options: --init --shm-size=512mb
options: --init --shm-size=512mb --cgroupns=private --privileged
strategy:
fail-fast: false
matrix:
@@ -433,6 +433,9 @@ jobs:
submodules: true
fetch-depth: 1
- name: Setup cgroup for use by test suite
run: sudo mkdir /sys/fs/cgroup/neon_testsuite && sudo chown nonroot:nonroot /sys/fs/cgroup/neon_testsuite
- name: Pytest regression tests
uses: ./.github/actions/run-python-test-set
with:
@@ -448,6 +451,7 @@ jobs:
TEST_RESULT_CONNSTR: ${{ secrets.REGRESS_TEST_RESULT_CONNSTR_NEW }}
CHECK_ONDISK_DATA_COMPATIBILITY: nonempty
BUILD_TAG: ${{ needs.tag.outputs.build-tag }}
NEON_TEST_SUITE_USE_CGROUPS: /sys/fs/cgroup/neon_testsuite
- name: Merge and upload coverage data
if: matrix.build_type == 'debug' && matrix.pg_version == 'v14'

View File

@@ -1,8 +1,5 @@
FROM debian:bullseye-slim
# Add nonroot user
RUN useradd -ms /bin/bash nonroot -b /home
SHELL ["/bin/bash", "-c"]
# System deps
RUN set -e \
@@ -43,6 +40,7 @@ RUN set -e \
openssh-client \
parallel \
pkg-config \
sudo \
unzip \
wget \
xz-utils \
@@ -50,6 +48,11 @@ RUN set -e \
zstd \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Add nonroot user
RUN useradd -ms /bin/bash nonroot -b /home
SHELL ["/bin/bash", "-c"]
RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
# protobuf-compiler (protoc)
ENV PROTOC_VERSION 25.1
RUN curl -fsSL "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-$(uname -m | sed 's/aarch64/aarch_64/g').zip" -o "protoc.zip" \