Skip to content

Commit 4393f5e

Browse files
CI matrix with more options
1 parent d15c9f4 commit 4393f5e

File tree

1 file changed

+32
-18
lines changed

1 file changed

+32
-18
lines changed

.github/workflows/tests.yaml

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -375,23 +375,30 @@ jobs:
375375
sse-kms-migration-tests:
376376
strategy:
377377
matrix:
378-
include:
379-
- kmsHideScalityArn: showArn
380-
job-name: sse-kms-migration-tests-show-arn-aws
381-
kmsContainer: localkms
382-
kmsProvider: aws
383-
kmsPort: 8080
384-
- kmsHideScalityArn: hideArn
385-
job-name: sse-kms-migration-tests-hide-arn-aws
386-
kmsContainer: localkms
387-
kmsProvider: aws
388-
kmsPort: 8080
389-
- kmsHideScalityArn: showArn
390-
job-name: sse-kms-migration-tests-show-arn-kmip
391-
kmsContainer: pykmip
392-
kmsProvider: kmip
393-
kmsPort: 5696
394-
name: ${{ matrix.job-name }}
378+
kms:
379+
- provider: aws
380+
container: localkms
381+
port: 8080
382+
- provider: kmip
383+
container: pykmip
384+
port: 5696
385+
opts:
386+
- kmsHideScalityArn: true
387+
globalEncryptionEnabled: false
388+
- kmsHideScalityArn: false
389+
globalEncryptionEnabled: false
390+
- kmsHideScalityArn: true
391+
globalEncryptionEnabled: true
392+
# This matrix should create 6 different jobs
393+
# No need to test globalEncryption with hidden arn (not related)
394+
name: >-
395+
sse-kms-migration-${{
396+
matrix.kms.provider
397+
}}-${{
398+
matrix.opts.kmsHideScalityArn && 'hideArn' || 'showArn'
399+
}}${{
400+
matrix.opts.globalEncryptionEnabled && '-global' || ''
401+
}}
395402
runs-on: ubuntu-latest
396403
needs: build
397404
env:
@@ -407,7 +414,14 @@ jobs:
407414
VAULT_IMAGE: ghcr.io/scality/vault:7.70.32
408415
KMS_IMAGE: nsmithuk/local-kms:3.11.7
409416
MPU_TESTING: "yes"
410-
JOB_NAME: ${{ matrix.job-name }}
417+
JOB_NAME: >-
418+
sse-kms-migration-${{
419+
matrix.kms.provider
420+
}}-${{
421+
matrix.kmsHideScalityArn && 'hideArn' || 'showArn'
422+
}}${{
423+
matrix.globalEncryptionEnabled && 'global' || ''
424+
}}
411425
COMPOSE_FILE: docker-compose.yaml:docker-compose.sse.yaml
412426
steps:
413427
- name: Checkout

0 commit comments

Comments
 (0)