Skip to content

e2e: update engine version #3128

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.

Sign up for GitHub

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

Closed
thaJeztah wants to merge 1 commit into from
Closed

e2e: update engine version #3128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ jobs:
- alpine
- debian
engine-version:
# - 20.10-dind # FIXME: Fails on 20.10
- stable-dind # TODO: Use 20.10-dind, stable-dind is deprecated
- 24.0-dind
include:
- target: non-experimental
engine-version: 19.03-dind
engine-version: 24.0-dind
steps:
-
name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion e2e/compose-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
image: 'registry:2'

engine:
image: 'docker:${TEST_ENGINE_VERSION:-stable-dind}'
image: 'docker:${TEST_ENGINE_VERSION:-dind}'
privileged: true
command: ['--insecure-registry=registry:5000']
environment:
Expand Down
2 changes: 2 additions & 0 deletions e2e/image/pull_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package image

import (
"strings"
"testing"

"github.com/docker/cli/e2e/internal/fixtures"
Expand All @@ -16,6 +17,7 @@ const registryPrefix = "registry:5000"

func TestPullWithContentTrust(t *testing.T) {
skip.If(t, environment.RemoteDaemon())
skip.If(t, strings.HasPrefix(environment.DaemonVersion(), "19.03"), "skipping on 19.03 daemon, as output format differs")

// Digests in golden files are linux/amd64 specific.
// TODO: Fix this test and make it work on all platforms.
Expand Down
2 changes: 1 addition & 1 deletion e2e/image/testdata/pull-with-content-trust.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Pull (1 of 1): registry:5000/trust-pull:latest@sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501
sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501: Pulling from trust-pull
registry:5000/trust-pull@sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501: Pulling from trust-pull
Digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501
Status: Downloaded newer image for registry:5000/trust-pull@sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501
registry:5000/trust-pull:latest
6 changes: 6 additions & 0 deletions internal/test/environment/testenv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ func boolFromString(val string) bool {
// DefaultPollSettings used with gotestyourself/poll
var DefaultPollSettings = poll.WithDelay(100 * time.Millisecond)

// DaemonVersion returns the version of the daemon
func DaemonVersion() string {
result := icmd.RunCmd(icmd.Command("docker", "info", "--format", "{{.ServerVersion}}"))
return strings.TrimSpace(result.Stdout())
}

// SkipIfNotExperimentalDaemon returns whether the test docker daemon is in experimental mode
func SkipIfNotExperimentalDaemon(t *testing.T) {
t.Helper()
Expand Down