Skip to content

Commit 582a737

Browse files
(wip) CI
1 parent 3348dd5 commit 582a737

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/docker/docker-compose.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ services:
44
command: sh -c "yarn start > /artifacts/s3.log"
55
network_mode: "host"
66
volumes:
7-
- ${HOME}/scality/cloudserver/tests/functional/kms-sse-migration/config.${SSE_CONF}.json:/conf/config.json
8-
- ${HOME}/scality/cloudserver/localData:/home/scality/s3/localData
9-
- ${HOME}/scality/cloudserver/localMetadata:/home/scality/s3/localMetadata
107
- /tmp/ssl:/ssl
118
- /tmp/ssl-kmip:/ssl-kmip
129
- ${HOME}/.aws/credentials:/root/.aws/credentials
1310
- /tmp/artifacts/${JOB_NAME}:/artifacts
11+
- ${HOME}/tests/functional/kms-sse-migration/config.${SSE_CONF}.json:/conf/config.json
12+
- ${HOME}/localData:/home/scality/s3/localData
13+
- ${HOME}/localMetadata:/home/scality/s3/localMetadata
1414
environment:
1515
- CI=true
1616
- ENABLE_LOCAL_CACHE=true

.github/workflows/tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -378,10 +378,6 @@ jobs:
378378
run: |
379379
set -exu
380380
mkdir -p /tmp/artifacts/${{ matrix.job-name }}/
381-
# - name: Setup python test environment
382-
# run: |
383-
# sudo apt-get install -y libdigest-hmac-perl
384-
# pip install 's3cmd==2.3.0'
385381
- name: Setup CI services (with old cloudserver image before sse migration)
386382
run: docker compose up -d
387383
working-directory: .github/docker
@@ -390,7 +386,7 @@ jobs:
390386
SSE_CONF: before
391387
- name: Run SSE before migration tests (setup buckets and objects)
392388
env:
393-
S3_CONFIG_FILE: tests/functional/kms-sse-migration/config.old.json
389+
S3_CONFIG_FILE: tests/functional/kms-sse-migration/config.before.json
394390
run: |-
395391
set -o pipefail;
396392
bash wait_for_local_port.bash 8000 40
@@ -429,6 +425,10 @@ jobs:
429425
run: |-
430426
set -o pipefail;
431427
yarn run ft_sse_arn | tee /tmp/artifacts/${{ matrix.job-name }}/arnPrefix.log
428+
- name: Print docker compose logs
429+
run: docker compose logs cloudserver
430+
working-directory: .github/docker
431+
if: failure()
432432
- name: Upload logs to artifacts
433433
uses: scality/action-artifacts@v4
434434
with:

0 commit comments

Comments
 (0)