Skip to content

CLDSRV-657: Fix kmip tests to use pykmip#5824

Merged
bert-e merged 1 commit intodevelopment/7.70from
improvement/CLDSRV-657-fix-kmip-tests
Jun 11, 2025
Merged

CLDSRV-657: Fix kmip tests to use pykmip#5824
bert-e merged 1 commit intodevelopment/7.70from
improvement/CLDSRV-657-fix-kmip-tests

Conversation

@BourgoisMickael
Copy link
Copy Markdown
Contributor

@BourgoisMickael BourgoisMickael commented Jun 11, 2025

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)

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)
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 11, 2025

Hello bourgoismickael,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 11, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@BourgoisMickael BourgoisMickael requested a review from Copilot June 11, 2025 15:45
@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 11, 2025

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 11, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: create_integration_branches

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates configuration and CI settings to enable KMIP tests using the pykmip provider.

  • Adds a new kmip config section in config.json with providerName.
  • Supplies KMIP-related environment variables in GitHub Actions for tests.
  • Adjusts the Docker Compose mount path and corrects an environment variable key.

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
config.json Introduce top-level kmip block with provider
.github/workflows/tests.yaml Define S3KMS and KMIP env vars for CI jobs
.github/docker/docker-compose.yaml Change /tmp/ssl-kmip mount path; fix S3KMIP_COMPOUND_CREATE
Comments suppressed due to low confidence (2)

.github/docker/docker-compose.yaml:34

  • The S3KMIP_CERT and S3KMIP_CA variables are set in the workflow but not passed into the container. Consider adding - S3KMIP_CERT and - S3KMIP_CA under environment so the container receives these paths.
- S3KMIP_KEY

config.json:99

  • [nitpick] Add a short comment or update README/docs to explain the new kmip section and its providerName field so users know how to configure other KMIP parameters (e.g., host, port, certificates).
"kmip": {

Copy link
Copy Markdown
Contributor

@tcarmet tcarmet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 11, 2025

Build failed

The build for commit did not succeed in branch w/9.0/improvement/CLDSRV-657-fix-kmip-tests

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 11, 2025

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.70

  • ✔️ development/8.8

  • ✔️ development/9.0

  • ✔️ development/9.1

The following branches have NOT changed:

  • development/7.10
  • development/7.4

Please check the status of the associated issue CLDSRV-657.

Goodbye bourgoismickael.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit 425c84a into development/7.70 Jun 11, 2025
11 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-657-fix-kmip-tests branch June 11, 2025 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants