Skip to content

Commit 260e6f0

Browse files
authored
ci: use same minio image as dev (#1687)
Minio's published image for use in GitHub Actions and other CI platforms is `edge-cicd`. This has not been updated for 4 years: * minio/minio#16099 This leads to different errors locally vs CI, which can be confusing: getodk/central#1500 Closes getodk/central#1500
1 parent a14f189 commit 260e6f0

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

.github/workflows/s3-e2e.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,17 @@ jobs:
2323
--health-interval 10s
2424
--health-timeout 5s
2525
--health-retries 5
26-
minio:
27-
# see: https://github.com/minio/minio/discussions/16099
28-
image: minio/minio:edge-cicd
29-
env:
30-
MINIO_ROOT_USER: odk-central-dev
31-
MINIO_ROOT_PASSWORD: topSecret123
32-
# Enable encryption - this changes how s3 ETags work
33-
# See: https://docs.aws.amazon.com/AmazonS3/latest/API/API_Object.html
34-
# See: https://github.com/minio/minio/discussions/19012
35-
MINIO_KMS_AUTO_ENCRYPTION: on
36-
MINIO_KMS_SECRET_KEY: odk-minio-test-key:QfdUCrn3UQ58W5pqCS5SX4SOlec9sT8yb4rZ4zK24w0=
37-
ports:
38-
- 9000:9000
39-
options: >-
40-
--health-cmd "curl -s http://localhost:9000/minio/health/live"
41-
--health-interval 10s
42-
--health-timeout 5s
43-
--health-retries 5
4426
steps:
4527
- uses: actions/checkout@v4
28+
- run: make fake-s3-server-persistent
4629
- name: Set node version
4730
uses: actions/setup-node@v4
4831
with:
4932
node-version: 22.21.0
5033
cache: 'npm'
5134
- run: npm ci
5235
- run: node lib/bin/create-docker-databases.js
36+
- run: sudo apt-get install wait-for-it
5337
- name: E2E Test
5438
timeout-minutes: 10
5539
run: ./test/e2e/s3/run-tests.sh

test/e2e/s3/run-tests.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ EOF
5252
read -rp ''
5353
fi
5454

55+
log "Waiting for fake-s3-server to start..."
56+
wait-for-it localhost:9000 --strict --timeout=10 -- echo '[test/e2e/s3/run-tests] fake-s3-server is UP!'
57+
5558
NODE_CONFIG_ENV=s3-dev node lib/bin/s3-create-bucket.js
5659
NODE_CONFIG_ENV=s3-dev make run &
5760
serverPid=$!

0 commit comments

Comments
 (0)