From 94d512a82ceb4ecac95158692396c0b6a0293edb Mon Sep 17 00:00:00 2001 From: Xavi Garcia Date: Tue, 25 Apr 2023 15:29:48 +0200 Subject: [PATCH 1/2] ci/s3tests-runner.sh : export CONTAINER_EXTRA_PARAMS and LIFE_CYCLE_INTERVAL_PARAM Fixes: https://github.com/aquarist-labs/s3gw/issues/474 Signed-off-by: Xavi Garcia --- tools/tests/s3tests-runner.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/tests/s3tests-runner.sh b/tools/tests/s3tests-runner.sh index afb115b2..2d50346f 100755 --- a/tools/tests/s3tests-runner.sh +++ b/tools/tests/s3tests-runner.sh @@ -279,6 +279,8 @@ _main() { export TMPFILE export OUTPUT_DIR export PARALLEL_HOME + export CONTAINER_EXTRA_PARAMS + export LIFE_CYCLE_INTERVAL_PARAM mkdir -p "$PARALLEL_HOME" parallel --record-env From 9b21dbc17bf6518959ee0194b4d2ecea43e8776a Mon Sep 17 00:00:00 2001 From: Xavi Garcia Date: Tue, 25 Apr 2023 16:08:41 +0200 Subject: [PATCH 2/2] ci: checkout HEAD for ceph repo Signed-off-by: Xavi Garcia --- .github/workflows/test.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d7f7f006..b58e832a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,13 @@ jobs: uses: actions/checkout@v3 with: path: s3gw - submodules: true + submodules: false + + - name: Checkout ceph + uses: actions/checkout@v3 + with: + repository: aquarist-labs/ceph + path: s3gw/ceph - name: Checkout s3tests uses: actions/checkout@v3