Skip to content

Commit 248b27a

Browse files
KodaiDKodaiD
committed
Fix workflow
1 parent 5c9de75 commit 248b27a

File tree

1 file changed

+72
-15
lines changed

1 file changed

+72
-15
lines changed

‎.github/workflows/object-storage-adapter-check.yaml‎

Lines changed: 72 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,53 @@ env:
4242
INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT: '"-Dscalardb.consensus_commit.coordinator.group_commit.enabled=true" "-Dscalardb.consensus_commit.coordinator.group_commit.old_group_abort_timeout_millis=15000" --tests "**.ConsensusCommit**"'
4343
AWS_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY }}
4444
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
45-
S3_REGION: ap-northeast-1
46-
S3_BUCKET_NAME: scalardb-test-bucket
45+
S3_REGION: us-east-1
46+
S3_BUCKET_BASE_NAME: s3-scalardb-test-bucket
4747
CLOUD_STORAGE_PROJECT_ID: ${{ secrets.CLOUD_STORAGE_PROJECT_ID }}
4848
CLOUD_STORAGE_SERVICE_ACCOUNT_KEY: ${{ secrets.CLOUD_STORAGE_SERVICE_ACCOUNT_KEY }}
49-
CLOUD_STORAGE_BUCKET_NAME: scalardb-test-bucket
49+
CLOUD_STORAGE_BUCKET_BASE_NAME: scalardb-test-bucket
5050

5151
jobs:
5252
integration-test-s3:
53-
name: S3 integration test (${{ matrix.mode.label }})
53+
name: S3 integration test (${{ matrix.test_group.label }})
5454
runs-on: ubuntu-latest
5555

5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
mode:
60-
- label: default
59+
test_group:
60+
- label: consensus_commit_default
61+
tests_filter: '--tests "**.ConsensusCommit**"'
62+
bucket_suffix: consensus-commit
6163
group_commit_enabled: false
62-
- label: with_group_commit
64+
- label: consensus_commit_with_group_commit
65+
tests_filter: '--tests "**.ConsensusCommit**"'
66+
bucket_suffix: consensus-commit-gc
6367
group_commit_enabled: true
68+
- label: storage_scan
69+
tests_filter: '--tests "**.ObjectStorageSingle**" --tests "**.ObjectStorageMultiple**"'
70+
bucket_suffix: storage-scan
71+
group_commit_enabled: false
72+
- label: storage_wrapper
73+
tests_filter: '--tests "**.ObjectStorageWrapper**"'
74+
bucket_suffix: storage-wrapper
75+
group_commit_enabled: false
76+
- label: storage_admin
77+
tests_filter: '--tests "**.ObjectStorageAdmin**"'
78+
bucket_suffix: storage-admin
79+
group_commit_enabled: false
80+
- label: storage_cm
81+
tests_filter: '--tests "**.ObjectStorageConditionalMutation**"'
82+
bucket_suffix: storage-cm
83+
group_commit_enabled: false
84+
- label: storage_others
85+
tests_filter: '--tests "**.ObjectStorage**" --tests "*!ObjectStorageSingle" --tests "*!ObjectStorageMultiple" --tests "*!ObjectStorageWrapper" --tests "*!ObjectStorageAdmin" --tests "*!ObjectStorageConditionalMutation"'
86+
bucket_suffix: storage
87+
group_commit_enabled: false
88+
- label: others
89+
tests_filter: '--tests "**.TwoPhaseConsensusCommit**" --tests "**.SingleCrudOperationTransaction**"'
90+
bucket_suffix: others
91+
group_commit_enabled: false
6492

6593
steps:
6694
- uses: actions/checkout@v5
@@ -95,26 +123,55 @@ jobs:
95123
uses: gradle/actions/setup-gradle@v5
96124

97125
- name: Execute Gradle 'integrationTestObjectStorage' task
98-
run: ./gradlew integrationTestObjectStorage -Dscalardb.object_storage.storage=s3 -Dscalardb.object_storage.endpoint=${{ env.S3_REGION }}/${{ env.S3_BUCKET_NAME }} ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
126+
run: ./gradlew integrationTestObjectStorage -Dscalardb.object_storage.storage=s3 -Dscalardb.object_storage.endpoint=${{ env.S3_REGION }}/${{ env.S3_BUCKET_BASE_NAME }}-${{ matrix.test_group.bucket_suffix }} -Dscalardb.object_storage.username='${{ env.AWS_ACCESS_KEY_ID }}' -Dscalardb.object_storage.password='${{ env.AWS_SECRET_ACCESS_KEY }}' ${{ matrix.test_group.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }} ${{ matrix.test_group.tests_filter }}
99127

100128
- name: Upload Gradle test reports
101129
if: always()
102130
uses: actions/upload-artifact@v5
103131
with:
104-
name: s3_integration_test_reports_${{ matrix.mode.label }}
132+
name: s3_integration_test_reports_${{ matrix.test_group.label }}
105133
path: core/build/reports/tests/integrationTestObjectStorage
134+
106135
integration-test-cloud-storage:
107-
name: Cloud Storage integration test (${{ matrix.mode.label }})
136+
name: Cloud Storage integration test (${{ matrix.test_group.label }})
108137
runs-on: ubuntu-latest
109138

110139
strategy:
111140
fail-fast: false
112141
matrix:
113-
mode:
114-
- label: default
142+
test_group:
143+
- label: consensus_commit_default
144+
tests_filter: '--tests "**.ConsensusCommit**"'
145+
bucket_suffix: consensus-commit
115146
group_commit_enabled: false
116-
- label: with_group_commit
147+
- label: consensus_commit_with_group_commit
148+
tests_filter: '--tests "**.ConsensusCommit**"'
149+
bucket_suffix: consensus-commit-gc
117150
group_commit_enabled: true
151+
- label: storage_scan
152+
tests_filter: '--tests "**.ObjectStorageSingle**" --tests "**.ObjectStorageMultiple**"'
153+
bucket_suffix: storage-scan
154+
group_commit_enabled: false
155+
- label: storage_wrapper
156+
tests_filter: '--tests "**.ObjectStorageWrapper**"'
157+
bucket_suffix: storage-wrapper
158+
group_commit_enabled: false
159+
- label: storage_admin
160+
tests_filter: '--tests "**.ObjectStorageAdmin**"'
161+
bucket_suffix: storage-admin
162+
group_commit_enabled: false
163+
- label: storage_cm
164+
tests_filter: '--tests "**.ObjectStorageConditionalMutation**"'
165+
bucket_suffix: storage-cm
166+
group_commit_enabled: false
167+
- label: storage_others
168+
tests_filter: '--tests "**.ObjectStorage**" --tests "*!ObjectStorageSingle" --tests "*!ObjectStorageMultiple" --tests "*!ObjectStorageWrapper" --tests "*!ObjectStorageAdmin" --tests "*!ObjectStorageConditionalMutation"'
169+
bucket_suffix: storage
170+
group_commit_enabled: false
171+
- label: others
172+
tests_filter: '--tests "**.TwoPhaseConsensusCommit**" --tests "**.SingleCrudOperationTransaction**"'
173+
bucket_suffix: others
174+
group_commit_enabled: false
118175

119176
steps:
120177
- uses: actions/checkout@v5
@@ -149,11 +206,11 @@ jobs:
149206
uses: gradle/actions/setup-gradle@v5
150207

151208
- name: Execute Gradle 'integrationTestObjectStorage' task
152-
run: ./gradlew integrationTestObjectStorage -Dscalardb.object_storage.storage=cloud-storage -Dscalardb.object_storage.endpoint=scalardb-test-bucket -Dscalardb.object_storage.username=${{ env.CLOUD_STORAGE_PROJECT_ID }} -Dscalardb.object_storage.password=${{ env.CLOUD_STORAGE_SERVICE_ACCOUNT_KEY }} ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
209+
run: ./gradlew integrationTestObjectStorage -Dscalardb.object_storage.storage=cloud-storage -Dscalardb.object_storage.endpoint=${{ env.CLOUD_STORAGE_BUCKET_BASE_NAME }}-${{ matrix.test_group.bucket_suffix }} -Dscalardb.object_storage.username='${{ env.CLOUD_STORAGE_PROJECT_ID }}' -Dscalardb.object_storage.password='${{ env.CLOUD_STORAGE_SERVICE_ACCOUNT_KEY }}' ${{ matrix.test_group.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }} ${{ matrix.test_group.tests_filter }}
153210

154211
- name: Upload Gradle test reports
155212
if: always()
156213
uses: actions/upload-artifact@v5
157214
with:
158-
name: cloud_storage_integration_test_reports_${{ matrix.mode.label }}
215+
name: cloud_storage_integration_test_reports_${{ matrix.test_group.label }}
159216
path: core/build/reports/tests/integrationTestObjectStorage

0 commit comments

Comments
 (0)