From 7fecf68e5b11c676e6403a441556ad5233683b36 Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Wed, 2 Aug 2023 00:27:57 +0400 Subject: [PATCH 1/9] Test obj_size Signed-off-by: Oleg Kulachenko --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e22c2f0ecc..f9432975f7 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -40,8 +40,8 @@ jobs: - name: Checkout neofs-testcases repository uses: actions/checkout@v3 with: - repository: nspcc-dev/neofs-testcases - ref: 'master' + repository: vvarg229/neofs-testcases + ref: 'obj_size' path: neofs-testcases - name: Checkout neofs-dev-env repository From f1d0bad5caaedcc3a84022b98392317585636873 Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Wed, 2 Aug 2023 00:28:53 +0400 Subject: [PATCH 2/9] Run all tests Signed-off-by: Oleg Kulachenko --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f9432975f7..e66a783c96 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -225,10 +225,10 @@ jobs: working-directory: neofs-testcases - name: Run Sanity tests for pull requests - timeout-minutes: 120 + timeout-minutes: 480 if: github.event_name == 'pull_request' run: | - source venv.local-pytest/bin/activate && pytest --show-capture=no -m "sanity" --alluredir=${GITHUB_WORKSPACE}/allure-results pytest_tests/testsuites + source venv.local-pytest/bin/activate && pytest --show-capture=no --alluredir=${GITHUB_WORKSPACE}/allure-results pytest_tests/testsuites working-directory: neofs-testcases - name: Run all tests for other events From 711a765e6f393ec1d9a92275e9fd8758d77f5c7c Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Wed, 2 Aug 2023 22:34:08 +0400 Subject: [PATCH 3/9] Test neofs-dev-env Signed-off-by: Oleg Kulachenko --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e66a783c96..eddc04042a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -47,8 +47,8 @@ jobs: - name: Checkout neofs-dev-env repository uses: actions/checkout@v3 with: - repository: nspcc-dev/neofs-dev-env - ref: 'feat/make-health-check-not-depend-on-shell' + repository: vvarg229/neofs-dev-env + ref: 'obj-size' path: neofs-dev-env - name: Checkout neofs-node repository From b6738c430c69c1e4e6fc6467a1d69474ab6e7bc5 Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Thu, 3 Aug 2023 13:38:33 +0400 Subject: [PATCH 4/9] Test Signed-off-by: Oleg Kulachenko --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index eddc04042a..d6aeced2d6 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -228,7 +228,7 @@ jobs: timeout-minutes: 480 if: github.event_name == 'pull_request' run: | - source venv.local-pytest/bin/activate && pytest --show-capture=no --alluredir=${GITHUB_WORKSPACE}/allure-results pytest_tests/testsuites + source venv.local-pytest/bin/activate && pytest -k test_s3_object_multipart --show-capture=no --alluredir=${GITHUB_WORKSPACE}/allure-results pytest_tests/testsuites working-directory: neofs-testcases - name: Run all tests for other events From 901853cd356118941365d60def8ea7f7581250da Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Fri, 4 Aug 2023 12:01:28 +0400 Subject: [PATCH 5/9] Test S3_GW Signed-off-by: Oleg Kulachenko --- .github/testcases-env | 7 ++++--- .github/workflows/run-tests.yml | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/testcases-env b/.github/testcases-env index eefeab45b3..76171c0378 100644 --- a/.github/testcases-env +++ b/.github/testcases-env @@ -38,11 +38,12 @@ REST_GW_VERSION=0.5.0 REST_GW_IMAGE=nspccdev/neofs-rest-gw # S3 Gate -S3_GW_VERSION=0.27.1 +S3_GW_VERSION=_TAG_ S3_GW_IMAGE=nspccdev/neofs-s3-gw S3_GW_PLATFORM=linux-amd64 -S3_AUTHMATE_URL=https://github.com/nspcc-dev/neofs-s3-gw/releases/download/v${S3_GW_VERSION}/neofs-s3-authmate-${S3_GW_PLATFORM} -S3_GW_URL=https://github.com/nspcc-dev/neofs-s3-gw/releases/download/v${S3_GW_VERSION}/neofs-s3-gw-${S3_GW_PLATFORM} +#S3_AUTHMATE_URL=https://github.com/nspcc-dev/neofs-s3-gw/releases/download/v${S3_GW_VERSION}/neofs-s3-authmate-${S3_GW_PLATFORM} +#S3_GW_URL=https://github.com/nspcc-dev/neofs-s3-gw/releases/download/v${S3_GW_VERSION}/neofs-s3-gw-${S3_GW_PLATFORM} +S3_GW_PATH=../neofs-s3-gw/bin # Coredns COREDNS_VERSION=v016 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d6aeced2d6..f8fc52a9d3 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -69,6 +69,14 @@ jobs: sudo chmod a+x neofs-cli working-directory: neofs-node-stable +################################################################# + - name: Checkout neofs-s3-gw repository - test https://github.com/nspcc-dev/neofs-s3-gw/pull/807 + uses: actions/checkout@v3 + with: + repository: nspcc-dev/neofs-s3-gw + ref: '806-upgrade-to-sdk-rc10' + path: neofs-s3-gw + ################################################################# - name: Set up Go uses: actions/setup-go@v4 @@ -120,6 +128,11 @@ jobs: run: | echo "CURRENT_TAG=$( make version | sed 's/^v//' )" >> $GITHUB_ENV working-directory: neofs-node +################################################################ + - name: Get TAG for neofs-s3-gw docker images + run: | + echo "CURRENT_TAG_S3_GW=$( make version | sed 's/^v//' )" >> $GITHUB_ENV + working-directory: neofs-node - name: Build NeoFS storage docker image timeout-minutes: 30 @@ -127,16 +140,28 @@ jobs: make image-storage working-directory: neofs-node +################################################################ - name: Build NeoFS Inner Ring docker image timeout-minutes: 30 run: | make image-ir working-directory: neofs-node +################################################################ + - name: Build neofs-s3-gw repository - test https://github.com/nspcc-dev/neofs-s3-gw/pull/807 + timeout-minutes: 30 + run: | + make image + make + echo "$(pwd)/bin" >> $GITHUB_PATH + echo "CURRENT_TAG_S3_GW=$( make version | sed 's/^v//' )" >> $GITHUB_ENV + working-directory: neofs-s3-gw + - name: Add NeoFS storage and NeoFS ir docker TAGs to testcases-env config file run: | sed -i "s/NODE_VERSION=.*/NODE_VERSION=${{ env.CURRENT_TAG }}/g" .github/testcases-env sed -i "s/IR_VERSION=.*/IR_VERSION=${{ env.CURRENT_TAG }}/g" .github/testcases-env + sed -i "s/S3_GW_VERSION=.*/S3_GW_VERSION=${{ env.CURRENT_TAG_S3_GW }}/g" .github/testcases-env working-directory: neofs-node ################################################################ From 12328ad99c58e12622811d7b8779f0edf7d75bd3 Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Fri, 4 Aug 2023 12:09:49 +0400 Subject: [PATCH 6/9] Add make docker/all Signed-off-by: Oleg Kulachenko --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f8fc52a9d3..06456bb126 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -152,7 +152,7 @@ jobs: timeout-minutes: 30 run: | make image - make + make docker/all echo "$(pwd)/bin" >> $GITHUB_PATH echo "CURRENT_TAG_S3_GW=$( make version | sed 's/^v//' )" >> $GITHUB_ENV working-directory: neofs-s3-gw From 22edf768a2a5c6c588dc18d5bd0b5fc1415e366a Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Fri, 4 Aug 2023 12:43:21 +0400 Subject: [PATCH 7/9] Add make dep Signed-off-by: Oleg Kulachenko --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 06456bb126..8c05e8ddf8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -151,6 +151,7 @@ jobs: - name: Build neofs-s3-gw repository - test https://github.com/nspcc-dev/neofs-s3-gw/pull/807 timeout-minutes: 30 run: | + make dep make image make docker/all echo "$(pwd)/bin" >> $GITHUB_PATH From 2d669d3488c19ba7855a15752bcc87ffdb891ce7 Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Fri, 4 Aug 2023 12:48:55 +0400 Subject: [PATCH 8/9] Add make sync-tree Signed-off-by: Oleg Kulachenko --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8c05e8ddf8..b4442045f0 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -151,6 +151,7 @@ jobs: - name: Build neofs-s3-gw repository - test https://github.com/nspcc-dev/neofs-s3-gw/pull/807 timeout-minutes: 30 run: | + make sync-tree make dep make image make docker/all From 3953ec1e2daf4fe8fd221ce3af3e5a1442c80e70 Mon Sep 17 00:00:00 2001 From: Oleg Kulachenko Date: Fri, 4 Aug 2023 14:38:29 +0400 Subject: [PATCH 9/9] Add RPC endpoint configuration Signed-off-by: Oleg Kulachenko --- .github/testcases-env | 2 ++ .github/workflows/run-tests.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/testcases-env b/.github/testcases-env index 76171c0378..eb23ab992d 100644 --- a/.github/testcases-env +++ b/.github/testcases-env @@ -68,3 +68,5 @@ NEOFS_STORAGE_CONTROL_GRPC_ENDPOINT_4=s04.${LOCAL_DOMAIN}:8081 # NeoFS adm binary NEOFS_ADM_PATH=../neofs-node/bin/neofs-adm + +S3_GW_RPC_ENDPOINT=http://morph-chain.neofs.devenv:30333 \ No newline at end of file diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b4442045f0..870d63a3cc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -76,6 +76,7 @@ jobs: repository: nspcc-dev/neofs-s3-gw ref: '806-upgrade-to-sdk-rc10' path: neofs-s3-gw +################################################################# ################################################################# - name: Set up Go