Skip to content

Commit 425c84a

Browse files
CLDSRV-657: Fix kmip tests to use pykmip
kmip tests were not using pykmip but file kms... Seems to be since migration from eve to GHA (Issue CLDSRV-244) where the kmip config via env was forgotten. Lost here: https://github.com/scality/cloudserver/pull/4926/files#diff-b0a705e0cbace75695b5e1e57b39c3a73ba96df02fd969ce4c16fd0a9a05df0cL96-L113 I change the ssl-kmip mount in container to match the same path on host and container for certs as we will reuse the same config on host to run tests (sse migration)
1 parent 6b86079 commit 425c84a

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.github/docker/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
network_mode: "host"
66
volumes:
77
- /tmp/ssl:/ssl
8-
- /tmp/ssl-kmip:/ssl-kmip
8+
- /tmp/ssl-kmip:/tmp/ssl-kmip
99
- ${HOME}/.aws/credentials:/root/.aws/credentials
1010
- /tmp/artifacts/${JOB_NAME}:/artifacts
1111
environment:
@@ -28,7 +28,7 @@ services:
2828
- S3KMS
2929
- S3KMIP_PORT
3030
- S3KMIP_HOSTS
31-
- S3KMIP-COMPOUND_CREATE
31+
- S3KMIP_COMPOUND_CREATE
3232
- S3KMIP_BUCKET_ATTRIBUTE_NAME
3333
- S3KMIP_PIPELINE_DEPTH
3434
- S3KMIP_KEY

.github/workflows/tests.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,15 @@ jobs:
325325
CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
326326
PYKMIP_IMAGE: ghcr.io/${{ github.repository }}/pykmip:${{ github.sha }}
327327
JOB_NAME: ${{ github.job }}
328+
S3KMS: kmip
329+
S3KMIP_PORT: 5696
330+
S3KMIP_HOSTS: pykmip.local
331+
S3KMIP_COMPOUND_CREATE: false
332+
S3KMIP_BUCKET_ATTRIBUTE_NAME: ''
333+
S3KMIP_PIPELINE_DEPTH: 8
334+
S3KMIP_KEY: /tmp/ssl-kmip/kmip-client-key.pem
335+
S3KMIP_CERT: /tmp/ssl-kmip/kmip-client-cert.pem
336+
S3KMIP_CA: /tmp/ssl-kmip/kmip-ca.pem
328337
steps:
329338
- name: Checkout
330339
uses: actions/checkout@v4

config.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,8 @@
9595
"endpoint": "http://127.0.0.1:8080",
9696
"ak": "tbd",
9797
"sk": "tbd"
98+
},
99+
"kmip": {
100+
"providerName": "thales"
98101
}
99102
}

0 commit comments

Comments
 (0)