Skip to content

[Backport 2025.2] fix(pull_image): correctly check if node is a docker container #11398

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

Merged
merged 1 commit into from
Jul 16, 2025

Conversation

scylladbbot
Copy link

Previously, the docker_hub_login method in RemoteDocker.pull_image was incorrectly using node.is_docker as a property. Since is_docker is implemented as a method, accessing it without parentheses always evaluated to True value.

This change ensures node.is_docker() is properly called, so the docker_hub_login behaves as intended.

Testing

PR pre-checks (self review)

  • I added the relevant backport labels
  • I didn't leave commented-out/debugging code

Reminders

  • Add New configuration option and document them (in sdcm/sct_config.py)

  • Add unit tests to cover my changes (under unit-test/ folder)

  • Update the Readme/doc folder relevant to this change (if needed)

  • (cherry picked from commit d1210d7)

Parent PR: #11393

@scylladbbot
Copy link
Author

@dimakr - This PR has conflicts, therefore it was moved to draft
Please resolve them and mark this PR as ready for review

Previously, the `docker_hub_login` method in `RemoteDocker.pull_image` was incorrectly using
`node.is_docker` as a property. Since `is_docker` is implemented as a method, accessing it
without parentheses always evaluated to True value.

This change ensures `node.is_docker()` is properly called, so the `docker_hub_login`
behaves as intended.

(cherry picked from commit d1210d7)
@dimakr dimakr force-pushed the backport/11393/to-2025.2 branch from 7aac9a2 to 20f2f8a Compare July 16, 2025 07:05
@dimakr dimakr removed the conflicts label Jul 16, 2025
@dimakr
Copy link
Contributor

dimakr commented Jul 16, 2025

resolved conflicts

@dimakr dimakr marked this pull request as ready for review July 16, 2025 07:26
@dimakr dimakr merged commit 03e3364 into scylladb:branch-2025.2 Jul 16, 2025
4 checks passed
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.

2 participants