Skip to content

Commit 571338a

Browse files
CLDSRV-657: Absolute path for config override
1 parent 9d563c7 commit 571338a

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/docker/local.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export VAULT_IMAGE_BEFORE_SSE_MIGRATION=ghcr.io/scality/vault:7.70.31
1616
export VAULT_IMAGE_ORIGINAL=ghcr.io/scality/vault:7.70.32
1717
export KMS_IMAGE=nsmithuk/local-kms:3.11.7
1818

19-
export S3_CONFIG_FILE=config.json
19+
export S3_CONFIG_FILE="$(pwd)/../../tests/functional/sse-kms-migration/config.json"
2020

2121
export kmsContainer=localkms
2222
export kmsProvider=aws

.github/workflows/tests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,8 @@ jobs:
674674
- name: Run SSE before migration tests (setup buckets and objects)
675675
shell: bash # for pipefail
676676
env:
677-
# yarn run does a cd into the test folder
678-
S3_CONFIG_FILE: config.json
677+
# absolute path to override default root config
678+
S3_CONFIG_FILE: ${{ github.workspace }}/tests/functional/sse-kms-migration/config.json
679679
S3KMS: file
680680
run: yarn run ft_sse_before_migration | tee /tmp/artifacts/${{ env.JOB_NAME }}/beforeMigration.log
681681
- name: Merge config.json files for options
@@ -713,17 +713,17 @@ jobs:
713713
env:
714714
# Functional tests needs access to the running config to use the same
715715
# KMS provider and sseMigration
716-
# yarn run does a cd into the test folder
717-
S3_CONFIG_FILE: config.json
716+
# absolute path to override default root config
717+
S3_CONFIG_FILE: ${{ github.workspace }}/tests/functional/sse-kms-migration/config.json
718718
S3KMS: ${{ matrix.kms.provider }}
719719
run: yarn run ft_sse_migration | tee /tmp/artifacts/${{ env.JOB_NAME }}/migration.log
720720
- name: Run SSE arnPrefix tests
721721
shell: bash # for pipefail
722722
env:
723723
# Functional tests needs access to the running config to use the same
724724
# KMS provider and sseMigration
725-
# yarn run does a cd into the test folder
726-
S3_CONFIG_FILE: config.json
725+
# absolute path to override default root config
726+
S3_CONFIG_FILE: ${{ github.workspace }}/tests/functional/sse-kms-migration/config.json
727727
S3KMS: ${{ matrix.kms.provider }}
728728
run: yarn run ft_sse_arn | tee /tmp/artifacts/${{ env.JOB_NAME }}/arnPrefix.log
729729
- name: Print docker compose logs

0 commit comments

Comments
 (0)