diff --git a/.github/workflows/s3tests.yml b/.github/workflows/s3tests.yml index c2e9a2529..6fa2ba5bb 100644 --- a/.github/workflows/s3tests.yml +++ b/.github/workflows/s3tests.yml @@ -34,11 +34,17 @@ jobs: go-version-file: 'go.mod' id: go - - name: Build weed + - name: Build an run weed shell: bash run: | cd /__w/seaweedfs/seaweedfs/weed go install -buildvcs=false + set -x + nohup weed -v 0 server -filer -s3 -ip.bind 0.0.0.0 \ + -master.raftHashicorp -master.electionTimeout 1s -master.volumeSizeLimitMB=1024 \ + -volume.max=100 -volume.preStopSeconds=1 -s3.port=8000 -metricsPort=9324 \ + -s3.allowEmptyFolder=false -s3.allowDeleteBucketNotEmpty=true -s3.config=../docker/compose/s3.json & + sleep 10 - name: Run Ceph S3 tests timeout-minutes: 15 @@ -46,12 +52,6 @@ jobs: S3TEST_CONF: /__w/seaweedfs/seaweedfs/docker/compose/s3tests.conf shell: bash run: | - set -x - nohup weed -v 0 server -filer -s3 -ip.bind 0.0.0.0 \ - -master.raftHashicorp -master.electionTimeout 1s -master.volumeSizeLimitMB=1024 \ - -volume.max=100 -volume.preStopSeconds=1 -s3.port=8000 -metricsPort=9324 \ - -s3.allowEmptyFolder=false -s3.allowDeleteBucketNotEmpty=true -s3.config=../docker/compose/s3.json & - sleep 10 cd /s3-tests tox -- \ s3tests_boto3/functional/test_s3.py::test_bucket_list_empty \ @@ -191,7 +191,6 @@ jobs: s3tests_boto3/functional/test_s3.py::test_ranged_request_return_trailing_bytes_response_code \ s3tests_boto3/functional/test_s3.py::test_copy_object_ifmatch_good \ s3tests_boto3/functional/test_s3.py::test_copy_object_ifnonematch_failed - pkill weed - uses: actions/checkout@v4 with: @@ -202,14 +201,7 @@ jobs: timeout-minutes: 15 shell: bash run: | - set -x - nohup weed -v 0 server -filer -s3 -ip.bind 0.0.0.0 \ - -master.raftHashicorp -master.electionTimeout 1s -master.volumeSizeLimitMB=1024 \ - -volume.max=100 -volume.preStopSeconds=1 -s3.port=8000 -metricsPort=9324 \ - -s3.allowEmptyFolder=false -s3.allowDeleteBucketNotEmpty=true -s3.config=../docker/compose/s3.json & - sleep 10 mkdir -p ~/.config/rclone cp /__w/seaweedfs/seaweedfs/docker/compose/rclone.conf ~/.config/rclone/rclone.conf cd /__w/seaweedfs/seaweedfs/rclone/backend/s3 go test -v -remote swfs: - pkill weed diff --git a/Makefile b/Makefile index 269b6ec91..21d1ed45e 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ full_install: cd weed; go install -tags "elastic gocdk sqlite ydb tikv rclone" server: install - weed -v 4 server -s3 -filer -volume.max=0 -master.volumeSizeLimitMB=1024 -volume.preStopSeconds=1 -s3.port=8000 -s3.allowEmptyFolder=false -s3.allowDeleteBucketNotEmpty=false -s3.config=./docker/compose/s3.json -metricsPort=9324 + weed -v 0 server -s3 -filer -volume.max=0 -master.volumeSizeLimitMB=1024 -volume.preStopSeconds=1 -s3.port=8000 -s3.allowEmptyFolder=false -s3.allowDeleteBucketNotEmpty=false -s3.config=./docker/compose/s3.json -metricsPort=9324 benchmark: install warp_install pkill weed || true