Merge branch 'w/8.8/improvement/CLDSRV-657-fix-kmip-tests' into tmp/octopus/w/9.0/improvement/CLDSRV-657-fix-kmip-tests

Author: bert-e

.github/docker/docker-compose.yaml

@@ -19,7 +19,7 @@ services:
     network_mode: "host"
     volumes:
       - /tmp/ssl:/ssl
-      - /tmp/ssl-kmip:/ssl-kmip
+      - /tmp/ssl-kmip:/tmp/ssl-kmip
       - ${HOME}/.aws/credentials:/root/.aws/credentials
       - /tmp/artifacts/${JOB_NAME}:/artifacts
       - /tmp/coverage/${JOB_NAME}:/coverage/test
@@ -44,7 +44,7 @@ services:
       - S3KMS
       - S3KMIP_PORT
       - S3KMIP_HOSTS
-      - S3KMIP-COMPOUND_CREATE
+      - S3KMIP_COMPOUND_CREATE
       - S3KMIP_BUCKET_ATTRIBUTE_NAME
       - S3KMIP_PIPELINE_DEPTH
       - S3KMIP_KEY

.github/workflows/tests.yaml

@@ -512,6 +512,15 @@ jobs:
       PYKMIP_IMAGE: ghcr.io/${{ github.repository }}/pykmip:${{ github.sha }}
       MONGODB_IMAGE: ghcr.io/${{ github.repository }}/ci-mongodb:${{ github.sha }}
       JOB_NAME: ${{ github.job }}
+      S3KMS: kmip
+      S3KMIP_PORT: 5696
+      S3KMIP_HOSTS: pykmip.local
+      S3KMIP_COMPOUND_CREATE: false
+      S3KMIP_BUCKET_ATTRIBUTE_NAME: ''
+      S3KMIP_PIPELINE_DEPTH: 8
+      S3KMIP_KEY: /tmp/ssl-kmip/kmip-client-key.pem
+      S3KMIP_CERT: /tmp/ssl-kmip/kmip-client-cert.pem
+      S3KMIP_CA: /tmp/ssl-kmip/kmip-ca.pem
     steps:
     - name: Checkout
       uses: actions/checkout@v4

config.json

@@ -139,5 +139,8 @@
         "endpoint": "http://127.0.0.1:8080",
         "ak": "tbd",
         "sk": "tbd"
+    },
+    "kmip": {
+        "providerName": "thales"
     }
 }