From 20c83e718b215bd6a7304194c12a449bfe0ef990 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Wed, 20 Sep 2023 17:29:16 +0800 Subject: [PATCH 1/2] ci: Migrate GCS to Databend Labs sponsored bucket Signed-off-by: Xuanwo --- .github/workflows/service_test_gcs.yml | 67 ++++++++++++++++---------- .github/workflows/service_test_s3.yml | 2 +- 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/.github/workflows/service_test_gcs.yml b/.github/workflows/service_test_gcs.yml index ca3bde624839..f0df67e7ac0b 100644 --- a/.github/workflows/service_test_gcs.yml +++ b/.github/workflows/service_test_gcs.yml @@ -37,41 +37,58 @@ concurrency: cancel-in-progress: true jobs: - gcs: - runs-on: ubuntu-latest - if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork - steps: - - uses: actions/checkout@v3 - - name: Setup Rust toolchain - uses: ./.github/actions/setup - with: - need-nextest: true - - name: Test - shell: bash - working-directory: core - run: cargo nextest run gcs - env: - OPENDAL_GCS_TEST: ${{ secrets.OPENDAL_GCS_TEST }} - OPENDAL_GCS_ROOT: ${{ secrets.OPENDAL_GCS_ROOT }} - OPENDAL_GCS_BUCKET: ${{ secrets.OPENDAL_GCS_BUCKET }} - OPENDAL_GCS_CREDENTIAL: ${{ secrets.OPENDAL_GCS_CREDENTIAL }} + jobs: + gcs: + runs-on: ubuntu-latest + if: (github.event_name == 'push' && github.repository == 'apache/incubator-opendal') || !github.event.pull_request.head.repo.fork + steps: + - uses: actions/checkout@v3 + - name: Setup Rust toolchain + uses: ./.github/actions/setup + with: + need-nextest: true + + - name: Load secret + id: op-load-secret + uses: 1password/load-secrets-action@v1 + with: + export-env: true + env: + OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} + OPENDAL_GCS_TEST: op://services/gcs/test + OPENDAL_GCS_ROOT: op://services/gcs/root + OPENDAL_GCS_BUCKET: op://services/gcs/bucket + OPENDAL_GCS_CREDENTIAL: op://services/gcs/credential + + - name: Test + shell: bash + working-directory: core + run: cargo nextest run gcs gcs-with-default-storage-class: runs-on: ubuntu-latest - if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork + if: (github.event_name == 'push' && github.repository == 'apache/incubator-opendal') || !github.event.pull_request.head.repo.fork steps: - uses: actions/checkout@v3 - name: Setup Rust toolchain uses: ./.github/actions/setup with: need-nextest: true + + - name: Load secret + id: op-load-secret + uses: 1password/load-secrets-action@v1 + with: + export-env: true + env: + OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} + OPENDAL_GCS_TEST: op://services/gcs/test + OPENDAL_GCS_ROOT: op://services/gcs/root + OPENDAL_GCS_BUCKET: op://services/gcs/bucket + OPENDAL_GCS_CREDENTIAL: op://services/gcs/credential + OPENDAL_GCS_DEFAULT_STORAGE_CLASS: STANDARD + - name: Test shell: bash working-directory: core run: cargo nextest run gcs - env: - OPENDAL_GCS_TEST: ${{ secrets.OPENDAL_GCS_TEST }} - OPENDAL_GCS_ROOT: ${{ secrets.OPENDAL_GCS_ROOT }} - OPENDAL_GCS_BUCKET: ${{ secrets.OPENDAL_GCS_BUCKET }} - OPENDAL_GCS_CREDENTIAL: ${{ secrets.OPENDAL_GCS_CREDENTIAL }} - OPENDAL_GCS_DEFAULT_STORAGE_CLASS: STANDARD diff --git a/.github/workflows/service_test_s3.yml b/.github/workflows/service_test_s3.yml index 14e34420b3f8..ebaed5b886ad 100644 --- a/.github/workflows/service_test_s3.yml +++ b/.github/workflows/service_test_s3.yml @@ -135,7 +135,7 @@ jobs: AWS_WEB_IDENTITY_TOKEN_FILE: tests/data/web_identity_token AWS_ROLE_ARN: arn:aws:iam::952853449216:role/opendal-testing-assume OPENDAL_S3_TEST: on - OPENDAL_S3_ROOT: assume + OPENDAL_S3_ROOT: CI/ OPENDAL_S3_BUCKET: opendal-testing OPENDAL_S3_ROLE_ARN: arn:aws:iam::952853449216:role/opendal-testing OPENDAL_S3_REGION: ap-northeast-1 From faddabc0edd55a9e36a8c2f8349de25174cb94af Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Wed, 20 Sep 2023 17:30:52 +0800 Subject: [PATCH 2/2] Fix workflow Signed-off-by: Xuanwo --- .github/workflows/service_test_gcs.yml | 49 +++++++++++++------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/.github/workflows/service_test_gcs.yml b/.github/workflows/service_test_gcs.yml index f0df67e7ac0b..322662aaa21b 100644 --- a/.github/workflows/service_test_gcs.yml +++ b/.github/workflows/service_test_gcs.yml @@ -37,33 +37,32 @@ concurrency: cancel-in-progress: true jobs: - jobs: - gcs: - runs-on: ubuntu-latest - if: (github.event_name == 'push' && github.repository == 'apache/incubator-opendal') || !github.event.pull_request.head.repo.fork - steps: - - uses: actions/checkout@v3 - - name: Setup Rust toolchain - uses: ./.github/actions/setup - with: - need-nextest: true + gcs: + runs-on: ubuntu-latest + if: (github.event_name == 'push' && github.repository == 'apache/incubator-opendal') || !github.event.pull_request.head.repo.fork + steps: + - uses: actions/checkout@v3 + - name: Setup Rust toolchain + uses: ./.github/actions/setup + with: + need-nextest: true - - name: Load secret - id: op-load-secret - uses: 1password/load-secrets-action@v1 - with: - export-env: true - env: - OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} - OPENDAL_GCS_TEST: op://services/gcs/test - OPENDAL_GCS_ROOT: op://services/gcs/root - OPENDAL_GCS_BUCKET: op://services/gcs/bucket - OPENDAL_GCS_CREDENTIAL: op://services/gcs/credential + - name: Load secret + id: op-load-secret + uses: 1password/load-secrets-action@v1 + with: + export-env: true + env: + OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} + OPENDAL_GCS_TEST: op://services/gcs/test + OPENDAL_GCS_ROOT: op://services/gcs/root + OPENDAL_GCS_BUCKET: op://services/gcs/bucket + OPENDAL_GCS_CREDENTIAL: op://services/gcs/credential - - name: Test - shell: bash - working-directory: core - run: cargo nextest run gcs + - name: Test + shell: bash + working-directory: core + run: cargo nextest run gcs gcs-with-default-storage-class: runs-on: ubuntu-latest