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

Cherry-pick commits from master to managed-service branch #1529

Open
wants to merge 12 commits into
base: managed-services
Choose a base branch
from

Conversation

tkan145
Copy link
Contributor

@tkan145 tkan145 commented Jan 24, 2025

What

Port the following PR(s) to manged service branch

#1513
#1516
#1518
#1519
#1520
#1524
#1528

This is done mainly to fix issue reported in #1528. Cherry-pick commit instead of fast-foward due to concern raised here #1522 (review)

@tkan145 tkan145 requested a review from a team as a code owner January 24, 2025 02:23
Update to support luarocks v3 and also refactor Dockerfile to install
luarocks and lua-rover directly from source
By default we run the prove task based on the number of available CPU cores.
The nprocs test will return the number of available CPU cores in the docker
executor VM, however the medium resource class only has access to
3 CPUs.

So the prove task will always spawn more workers than the number of available
CPU cores, which then causes the CPU to max out during the test and cause
random errors.
@tkan145 tkan145 force-pushed the fapi-wrong-config-mas branch from 3ea813d to 39ebef8 Compare January 28, 2025 04:19
@tkan145 tkan145 requested a review from a team as a code owner January 28, 2025 04:19
@tkan145 tkan145 removed the request for review from a team January 28, 2025 05:18
@eguzki
Copy link
Member

eguzki commented Jan 28, 2025

This is targetting master and slightly overlapping #1528. That is correct?

@tkan145 tkan145 changed the base branch from master to managed-services January 28, 2025 23:53
@tkan145
Copy link
Contributor Author

tkan145 commented Jan 28, 2025

My bad, it's targeting managed-service branch. Updated the branch according.

@eguzki
Copy link
Member

eguzki commented Jan 29, 2025

This is doing far more than backport #1528, intended?

@tkan145
Copy link
Contributor Author

tkan145 commented Jan 30, 2025

This is tricky, when we decided to release the new managed-services release, I intentionally just fast forwarded right before all the konflux and luarock/lua-rover changes.

But since then we have to

  • Migrated away from Docker image
  • And our luarover package is pointing to the HEAD in master branch (support luarocks v3) but the current image is only support luarocks v2 -> backport luarocks change otherwise the CI tests will fails
  • And we are currently in the process of migrating to Konflux and are still trying to figure out how to handle different build versions.

If you are ok with having the CI failing on this branch then I will just cherry-pick the fix alone. Otherwise we need to have back-port everything else except Konflux.

WDTY?

@eguzki
Copy link
Member

eguzki commented Jan 30, 2025

you add those changes to the description and reword the title and I will accept it and review. Deal?

@tkan145 tkan145 changed the title [THREESCALE-11620] Financial-grade API (FAPI) policy not showning up in admin portal (mas) Fast-forward managed-service branch but exclude Konflux commits Feb 3, 2025
@tkan145 tkan145 changed the title Fast-forward managed-service branch but exclude Konflux commits Cherry-pick commits from master to managed-service branch Feb 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants