Skip to content

Fix and improve for local deployment #1102

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

Open
wants to merge 10 commits into
base: main
Choose a base branch
from

Conversation

tollsimy
Copy link

@tollsimy tollsimy commented Apr 3, 2025

This PR aims to fix and improve containers for local deployments by:

  • remove obsolete Dockerfiles (move to ./kci docker)
  • merging all compose files in one (pipeline + lava-callback + pipeline-kcidb)
  • refactoring compose files and removing obsolete entries
  • add missing config path argument to services
  • updating relative docs

This PR is tightly related to recent fixes and improvements I am proposing in kernelci/kernelci-deploy.

@tollsimy tollsimy force-pushed the bugfix/containers branch 2 times, most recently from 06e042e to c9fc75f Compare April 3, 2025 09:03
Copy link
Member

@nuclearcat nuclearcat left a comment

Choose a reason for hiding this comment

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

How to reproduce bug this patch (rename timeout) is fixing?

@tollsimy
Copy link
Author

tollsimy commented Apr 3, 2025

Rename timeout patch fixes:

cycle detected at path: services.timeout
cycle detected at path: services.timeout

Environment:

docker --version
Docker version 28.0.2, build 0442a73
docker-compose --version
Docker Compose version v2.30.2

@tollsimy tollsimy force-pushed the bugfix/containers branch from c9fc75f to 5030564 Compare April 4, 2025 09:55
@tollsimy
Copy link
Author

tollsimy commented Apr 4, 2025

What about something like this? I removed obsolete Dockerfiles. I will open another PR in deployment to add missing container builds.

@nuclearcat
Copy link
Member

I will need to check if renaming will cause any issues with existing deployment scripts, it might take a bit of time, but likely will do this week.

@tollsimy tollsimy marked this pull request as draft April 10, 2025 11:37
@tollsimy
Copy link
Author

tollsimy commented Apr 10, 2025

Edit: apparently the cycle detected at path is a docker-compose bug related to yaml anchors. Does not happen if using the new docker compose command. Time to remove depreated docker-compose from local deployment scripts.
I will change and push new changes.

@tollsimy tollsimy changed the title Fix containers for local deployments Fix and improve local deployment Apr 10, 2025
@tollsimy tollsimy changed the title Fix and improve local deployment Fix and improve for local deployment Apr 10, 2025
@tollsimy tollsimy marked this pull request as ready for review April 10, 2025 16:51
@nuclearcat nuclearcat added the staging-skip Don't test automatically on staging.kernelci.org label Apr 14, 2025
@nuclearcat
Copy link
Member

Probably this PR causes breakage at staging script

ERROR: Version mismatch: file ./docker-compose.yaml specifies version 1 but extension file ./docker-compose-kcidb.yaml uses version 3.0

@tollsimy
Copy link
Author

tollsimy commented Apr 14, 2025

You're right @nuclearcat , since this PR merges pipeline-lava-callback, pipeline-kcidb and all other pipeline services in one compose file in 03042de, staging.kernelci.org in kernelci-deploy should be modified to execute only one compose.
Moreover, the version mismatch is due to the fact the the old (and deprecated) docker-compose is used.
Upgrading to the new docker compose plugin should remove that error (since "version" property is also deprecated).

Not sure but maybe upgrading to the new docker compose could also fix issue reported kernelci/kernelci-api#598 and #1045.

@tollsimy tollsimy force-pushed the bugfix/containers branch 3 times, most recently from d9882c7 to 24ea02e Compare April 15, 2025 10:40
@nuclearcat nuclearcat removed the staging-skip Don't test automatically on staging.kernelci.org label Apr 22, 2025
@nuclearcat
Copy link
Member

nuclearcat commented Apr 22, 2025

https://github.com/kernelci/kernelci-core/actions/runs/14589446598/job/40921114087


2025-04-22 07:43:10,999 - INFO - Checking PR 1102: `Fix and improve for local deployment` by tollsimy
2025-04-22 07:43:10,999 - INFO - Processing PR 1102
error: callback-requirements.txt: No such file or directory
error: patch failed: docker-compose.yaml:106
error: docker-compose.yaml: patch does not apply
error: patch failed: docker-compose.yaml:155
error: docker-compose.yaml: patch does not apply
2025-04-22 07:43:11,294 - ERROR - Failed to apply patch for PR 1102

@nuclearcat
Copy link
Member

I think you need to rebase your patch

@nuclearcat nuclearcat added the staging-skip Don't test automatically on staging.kernelci.org label Apr 22, 2025
@tollsimy tollsimy force-pushed the bugfix/containers branch from ce5cbf1 to 78a84a1 Compare April 23, 2025 07:28
@tollsimy
Copy link
Author

tollsimy commented Apr 23, 2025

Done, this should work, thanks @nuclearcat !

@tollsimy tollsimy force-pushed the bugfix/containers branch from 78a84a1 to 6253e95 Compare April 29, 2025 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
staging-skip Don't test automatically on staging.kernelci.org
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants