Skip to content

integration-cli: Update default CLI version to v18.06.3-ce#49677

Merged
vvoland merged 3 commits intomoby:masterfrom
vvoland:integration-cli-bump-cli
Apr 11, 2025
Merged

integration-cli: Update default CLI version to v18.06.3-ce#49677
vvoland merged 3 commits intomoby:masterfrom
vvoland:integration-cli-bump-cli

Conversation

@vvoland
Copy link
Contributor

@vvoland vvoland commented Mar 21, 2025

This updates the Docker CLI version used for integration-cli tests from v17.06.2-ce to v18.06.3-ce.

v18.06 is the first one that supports enabling BuildKit.

Personally, I'd be happy with bumping that even further (like v23), but if we really want to still test against older clients, let's use a version that supports buildkit at least.

@vvoland vvoland added this to the 28.0.3 milestone Mar 21, 2025
@vvoland vvoland self-assigned this Mar 21, 2025
This was referenced Mar 21, 2025
Closed
Merged
@vvoland
Copy link
Contributor Author

vvoland commented Mar 21, 2025

The test failure is fixed by #49678:

     docker_cli_build_test.go:6221: assertion failed: string "2025-03-21T12:22:31.463696549Z image create sha256:b43727b50b0e82c593d6fff4654c6a57046c229656bc6b68f3c4446bcba36efb (name=sha256:b43727b50b0e82c593d6fff4654c6a57046c229656bc6b68f3c4446bcba36efb)\n" does not contain "image tag"
    docker_cli_build_test.go:6222: assertion failed: string "2025-03-21T12:22:31.463696549Z image create sha256:b43727b50b0e82c593d6fff4654c6a57046c229656bc6b68f3c4446bcba36efb (name=sha256:b43727b50b0e82c593d6fff4654c6a57046c229656bc6b68f3c4446bcba36efb)\n" does not contain "testbuildemitsimagetagevent"
        --- FAIL: TestDockerCLIBuildSuite/TestBuildEmitsEvents/buildkit=true/with_tag (1.61s)

=== FAIL: amd64.integration-cli TestDockerCLIBuildSuite/TestBuildEmitsEvents (8.21s)
    --- FAIL: TestDockerCLIBuildSuite/TestBuildEmitsEvents (8.21s)

@vvoland vvoland modified the milestones: 28.0.3, 28.0.4, 28.0.5 Mar 24, 2025
@vvoland vvoland force-pushed the integration-cli-bump-cli branch from 3e42595 to 47844a6 Compare March 26, 2025 12:41
@vvoland
Copy link
Contributor Author

vvoland commented Mar 26, 2025

Rebased after #49678, should be green now

@thompson-shaun thompson-shaun moved this from Up next to Complete in 🔦 Maintainer spotlight Mar 27, 2025
@thompson-shaun thompson-shaun modified the milestones: 28.0.5, 28.1.0 Apr 3, 2025
@vvoland
Copy link
Contributor Author

vvoland commented Apr 9, 2025 •
edited
Loading

This turns out to be a regression between v18.06 and v18.05

=== FAIL: amd64.integration-cli TestDockerSwarmSuite/TestSwarmUpdate (1.88s)
    docker_cli_swarm_test.go:74: assertion failed: 
        --- spec.CAConfig.ExternalCAs[0].CACert
        +++ →
        @@ -1,11 +1 @@
        ------BEGIN CERTIFICATE-----
        -MIIBaTCCARCgAwIBAgIUUak1BQiRN9x+klYl7fWmPu7//PswCgYIKoZIzj0EAwIw
        -EzERMA8GA1UEAxMIc3dhcm0tY2EwHhcNMjUwMzI2MTcxNjAwWhcNNDUwMzIxMTcx
        -NjAwWjATMREwDwYDVQQDEwhzd2FybS1jYTBZMBMGByqGSM49AgEGCCqGSM49AwEH
        -A0IABHup3ZhXIsnnQRnCNTwel392ObzzoJ7gU11bU2xaR2p69BD6Z1IW+8FVVhEF
        -gtna0wvtYuvAil5YU0wje8fV5W+jQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
        -Af8EBTADAQH/MB0GA1UdDgQWBBRkqDjiJjda1r5/I6DDIVigziSPjTAKBggqhkjO
        -PQQDAgNHADBEAiALJhEhHjyQ9vnLEmKSfXu9IzvZTqx/Z8QBE2N/wzUyHQIgEEYd
        -ro7JygQc/nFkls9yiAWfZAAjLzmkeQ92Fk6sNjE=
        ------END CERTIFICATE-----

Opened a fix on the CLI side: docker/cli#5995

But obviously we can't fix it in the old CLI, so I'll just skip this part 🙈

@vvoland vvoland mentioned this pull request Apr 9, 2025
Merged
vvoland added 3 commits April 10, 2025 11:39
@vvoland
integration-cli: Update default CLI version to v18.06.3-ce
fab9480 
This updates the Docker CLI version used for integration-cli tests from
v17.06.2-ce to v18.06.3-ce.

v18.06 is the first one that supports enabling BuildKit.

Signed-off-by: Paweł Gronowski <[email protected]>
@vvoland
integration-cli/TestSwarmInit: Skip failing part on CLI after 18.06
ea6c76e 
Signed-off-by: Paweł Gronowski <[email protected]>
@vvoland
integration-cli/swarm: Update to use gotest.tools
5f9d99b 
Signed-off-by: Paweł Gronowski <[email protected]>
@vvoland vvoland force-pushed the integration-cli-bump-cli branch from d948cf5 to 5f9d99b Compare April 10, 2025 09:39
@vvoland vvoland marked this pull request as ready for review April 10, 2025 11:33
@vvoland vvoland requested a review from tianon as a code owner April 10, 2025 11:33
@vvoland vvoland requested a review from thaJeztah April 10, 2025 14:36
thaJeztah
thaJeztah approved these changes Apr 10, 2025
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@vvoland vvoland merged commit fb2983a into moby:master Apr 11, 2025
147 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@tianon tianon Awaiting requested review from tianon tianon is a code owner

Assignees

@vvoland vvoland

Labels

area/testing status/2-code-review

Projects

🔦 Maintainer spotlight
Archived in project

Milestone

28.1.0

Development

Successfully merging this pull request may close these issues.

3 participants

@vvoland @thaJeztah @thompson-shaun