Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(docker-compose): add FIPS environment variable to docker-compose for busted tests #624

Merged
merged 2 commits into from
Sep 24, 2024

Conversation

Water-Melon
Copy link
Contributor

@Water-Melon Water-Melon commented Sep 14, 2024

@Tieske Tieske marked this pull request as draft September 16, 2024 08:37
@Tieske
Copy link
Member

Tieske commented Sep 16, 2024

Let's keep this as draft until https://github.com/Kong/kong-ee/pull/10031 is green and approved.

pongo.sh Outdated Show resolved Hide resolved
@Water-Melon Water-Melon marked this pull request as ready for review September 24, 2024 06:22
@Water-Melon
Copy link
Contributor Author

@Tieske all the PRs have been approved and are green.

@Tieske
Copy link
Member

Tieske commented Sep 24, 2024

@Water-Melon thx! looking good.

I added a "do not merge" label, to ensure we do this in the proper order. My suggestion would be this:

  • merge the Kong EE PR (https://github.com/Kong/kong-ee/pull/10031) which points to this PRs branch; kag5187_add_fips_env. This will ensure that Kong-EE CI won't fail.
  • remove the "Do not merge" label from this PR
  • merge this PR in Pongo, such that the fix is in Pongo master
  • if the branch gets deleted, restore it immediately
  • release Pongo. As part of the release instructions, we create another Kong-EE branch that bumps the Pongo version (from this branch kag5187_add_fips_env to the newly released Pongo version)
  • after EE pr with Pongo bump is merged, delete kag5187_add_fips_env branch from the Pongo repo.

This approach should ensure that there are no intermediate CI breakages in either Kong-EE nor Pongo.

@fffonion
Copy link
Contributor

@Tieske For step 1, would you help create a pre-release or a tag pointing to this PR to use for kong-ee? Point something to a branch doesn't seem very reliable.

@Tieske Tieske merged commit 6ce752c into master Sep 24, 2024
5 checks passed
@Tieske Tieske deleted the kag5187_add_fips_env branch September 24, 2024 15:14
@Tieske Tieske restored the kag5187_add_fips_env branch September 24, 2024 15:14
@Tieske
Copy link
Member

Tieske commented Sep 24, 2024

Pongo release can be tracked here: https://github.com/Kong/kong-ee/pull/10335

@Tieske Tieske deleted the kag5187_add_fips_env branch September 25, 2024 09:06
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.

4 participants