Skip to content

Commit b7b0eff

Browse files
committed
CLDSRV-780: update CI for server access logs functional tests
1 parent 8137ece commit b7b0eff

File tree

2 files changed

+41
-0
lines changed

2 files changed

+41
-0
lines changed

.github/docker/docker-compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ services:
88
- ${HOME}/.aws/credentials:/root/.aws/credentials
99
- /tmp/artifacts/${JOB_NAME}:/artifacts
1010
- /tmp/coverage/${JOB_NAME}:/coverage/test
11+
- /logs:/logs
1112
environment:
1213
- CI=true
1314
- ENABLE_LOCAL_CACHE=true

.github/workflows/tests.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,19 @@ jobs:
313313
MONGODB_IMAGE: ghcr.io/${{ github.repository }}/ci-mongodb:${{ github.sha }}
314314
CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}-testcoverage
315315
JOB_NAME: ${{ github.job }}
316+
S3_SERVER_ACCESS_LOGS_MODE: ENABLED
316317
steps:
317318
- name: Checkout
318319
uses: actions/checkout@v4
319320
- name: Setup CI environment
320321
uses: ./.github/actions/setup-ci
322+
- name: Setup server access logs file and directory
323+
shell: bash
324+
run: |
325+
set -exu
326+
sudo mkdir -p /logs
327+
sudo chmod 0777 /logs
328+
sudo touch /logs/server-access.log && sudo chmod 0666 /logs/server-access.log
321329
- name: Setup CI services
322330
run: docker compose --profile mongo up -d
323331
working-directory: .github/docker
@@ -366,11 +374,19 @@ jobs:
366374
MONGODB_IMAGE: ghcr.io/${{ github.repository }}/ci-mongodb:${{ github.sha }}
367375
CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}-testcoverage
368376
JOB_NAME: ${{ github.job }}
377+
S3_SERVER_ACCESS_LOGS_MODE: ENABLED
369378
steps:
370379
- name: Checkout
371380
uses: actions/checkout@v4
372381
- name: Setup CI environment
373382
uses: ./.github/actions/setup-ci
383+
- name: Setup server access logs file and directory
384+
shell: bash
385+
run: |
386+
set -exu
387+
sudo mkdir -p /logs
388+
sudo chmod 0777 /logs
389+
sudo touch /logs/server-access.log && sudo chmod 0666 /logs/server-access.log
374390
- name: Setup CI services
375391
run: docker compose --profile mongo up -d
376392
working-directory: .github/docker
@@ -426,6 +442,7 @@ jobs:
426442
MPU_TESTING: "yes"
427443
ENABLE_NULL_VERSION_COMPAT_MODE: "${{ matrix.enable-null-compat }}"
428444
JOB_NAME: ${{ matrix.job-name }}
445+
S3_SERVER_ACCESS_LOGS_MODE: ENABLED
429446
steps:
430447
- name: Checkout
431448
uses: actions/checkout@v4
@@ -436,6 +453,13 @@ jobs:
436453
run: |
437454
set -exu
438455
mkdir -p /tmp/artifacts/${{ matrix.job-name }}/
456+
- name: Setup server access logs file and directory
457+
shell: bash
458+
run: |
459+
set -exu
460+
sudo mkdir -p /logs
461+
sudo chmod 0777 /logs
462+
sudo touch /logs/server-access.log && sudo chmod 0666 /logs/server-access.log
439463
- name: Setup CI services
440464
run: docker compose up -d
441465
working-directory: .github/docker
@@ -499,6 +523,7 @@ jobs:
499523
VAULT_IMAGE: ghcr.io/scality/vault:7.76.0
500524
S3_END_TO_END: true
501525
S3_TESTVAL_OWNERCANONICALID: 79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be
526+
S3_SERVER_ACCESS_LOGS_MODE: ENABLED
502527
steps:
503528
- name: Checkout
504529
uses: actions/checkout@v4
@@ -515,6 +540,13 @@ jobs:
515540
run: |
516541
set -exu
517542
mkdir -p /tmp/artifacts/${{ matrix.job-name }}/
543+
- name: Setup server access logs file and directory
544+
shell: bash
545+
run: |
546+
set -exu
547+
sudo mkdir -p /logs
548+
sudo chmod 0777 /logs
549+
sudo touch /logs/server-access.log && sudo chmod 0666 /logs/server-access.log
518550
- name: Modify md-config.json for vformat
519551
run: |
520552
sed -i 's/\("METADATA_NEW_BUCKETS_VFORMAT":\s*\)"[^"]*"/\1"${{ matrix.vformat }}"/' .github/docker/md-config.json
@@ -830,6 +862,7 @@ jobs:
830862
CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}-testcoverage
831863
JOB_NAME: ${{ github.job }}
832864
ENABLE_NULL_VERSION_COMPAT_MODE: true # needed with mongodb backend
865+
S3_SERVER_ACCESS_LOGS_MODE: ENABLED
833866
steps:
834867
- name: Checkout
835868
uses: actions/checkout@v4
@@ -841,6 +874,13 @@ jobs:
841874
password: ${{ github.token }}
842875
- name: Setup CI environment
843876
uses: ./.github/actions/setup-ci
877+
- name: Setup server access logs file and directory
878+
shell: bash
879+
run: |
880+
set -exu
881+
sudo mkdir -p /logs
882+
sudo chmod 0777 /logs
883+
sudo touch /logs/server-access.log && sudo chmod 0666 /logs/server-access.log
844884
- uses: ruby/setup-ruby@v1
845885
with:
846886
ruby-version: '3.2'

0 commit comments

Comments
 (0)