File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -13,15 +13,13 @@ jobs:
1313
1414 steps :
1515 - name : Checkout
16- uses : actions/checkout@v2 # Required to mount the Github Workspace to a volume
16+ uses : actions/checkout@v2
1717 - name : run one version test
1818 uses : sudo-bot/action-docker-compose@latest
1919 with :
20- # https://docs.docker.com/compose/reference/overview/
2120 cli-args : -f ./regression-run/docker-compose.yml up --build s3fs-tests --exit-code-from s3fs-tests
2221 - name : run multiversion test
2322 uses : sudo-bot/action-docker-compose@latest
2423 with :
25- # https://docs.docker.com/compose/reference/overview/
2624 cli-args : -f ./regression-run/docker-compose.yml up --build s3fs-test-multiple-versions --exit-code-from s3fs-test-multiple-versions
2725
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ services:
3232 AWS_SECRET_KEY : ' secret-key-dont-matter-for-fake-s3'
3333 AWS_ENDPOINT : ' http://s3fs-fake-s3:4566/'
3434 # defaulting command to unit tests, for multiversion we will use slimmer regression.js
35- command : ${TEST_COMMAND:-npm run test}
35+ command : " ${TEST_COMMAND:-npm run test}"
3636
3737
3838 s3fs-test-multiple-versions :
Original file line number Diff line number Diff line change 11FROM alpine:3.16
22
33WORKDIR /usr/local/src/s3fs
4- COPY . .
54COPY --from=docker /usr/libexec/docker/cli-plugins/docker-compose /usr/bin/docker-compose
65COPY ./regression-run/test-multiple-versions/entrypoint.sh /entrypoint.sh
6+ COPY . .
77
88ENTRYPOINT /entrypoint.sh
99
Original file line number Diff line number Diff line change @@ -5,30 +5,30 @@ function cleanup()
55{
66 exit_status=$?
77 echo " exit was $exit_status "
8- docker-compose -f regression-run/docker-compose.yml down 2>&1 || true
9- exit $exit_status
8+
9+ docker-compose -f regression-run/docker-compose.yml rm s3fs-fake-s3 -f || true
10+
11+ exit " $exit_status "
1012}
1113trap cleanup EXIT
1214
13- docker-compose -f regression-run/docker-compose.yml up -d --no-recreate s3fs-fake-s3
15+ docker-compose -f regression-run/docker-compose.yml up --build - d --no-recreate s3fs-fake-s3
1416
1517for NODEJS_VERSION in $NODEJS_VERSIONS_TO_TEST_UNIT
1618do
17- export NODEJS_VERSION=" ${NODEJS_VERSION} "
18- docker-compose -f regression-run/docker-compose.yml build s3fs-tests
1919 echo " ======================Start unit testing nodejs version ${NODEJS_VERSION} ============================="
20- NODE_ENV=production \
20+ NODEJS_VERSION=" ${NODEJS_VERSION} " \
21+ NODE_ENV=development \
2122 TEST_COMMAND=" npm run test" \
22- docker-compose -f regression-run/docker-compose.yml up s3fs-tests --no-recreate --exit-code-from s3fs-tests
23+ docker-compose -f regression-run/docker-compose.yml up --build s3fs-tests --no-recreate --exit-code-from s3fs-tests
2324done
2425
2526
2627for NODEJS_VERSION in $NODEJS_VERSIONS_TO_TEST_REGRESSION
2728do
28- export NODEJS_VERSION=" ${NODEJS_VERSION} "
29- docker-compose -f regression-run/docker-compose.yml build s3fs-tests
3029 echo " ======================Start regression testing nodejs version ${NODEJS_VERSION} ============================="
30+ NODEJS_VERSION=" ${NODEJS_VERSION} " \
3131 NODE_ENV=production \
3232 TEST_COMMAND=" npm run test-regression" \
33- docker-compose -f regression-run/docker-compose.yml up s3fs-tests --no-recreate --exit-code-from s3fs-tests
33+ docker-compose -f regression-run/docker-compose.yml up --build s3fs-tests --no-recreate --exit-code-from s3fs-tests
3434done
You can’t perform that action at this time.
0 commit comments