1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

workflow/e2e: only run experimental daemon

Browse Source 
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
This commit is contained in:
Alano Terblanche 2025-02-24 14:29:48 +01:00
parent 656523e20d
commit c26090bd3e
No known key found for this signature in database
GPG Key ID: 0E8FACD1BA98DE27
5 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/e2e.yml vendored
View File

@ -25,14 +25,13 @@ on:
pull_request: pull_request:
jobs: jobs:
e2e: tests:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
target: target:
- non-experimental - local
- experimental
- connhelper-ssh - connhelper-ssh
base: base:
- alpine - alpine

15
docker.Makefile
View File

@ -128,17 +128,10 @@ build-e2e-image:
IMAGE_NAME=$(E2E_IMAGE_NAME) VERSION=$(VERSION) docker buildx bake e2e-image IMAGE_NAME=$(E2E_IMAGE_NAME) VERSION=$(VERSION) docker buildx bake e2e-image
.PHONY: test-e2e .PHONY: test-e2e
test-e2e: test-e2e-non-experimental test-e2e-experimental test-e2e-connhelper-ssh ## run all e2e tests test-e2e: test-e2e-local test-e2e-connhelper-ssh ## run all e2e tests
.PHONY: test-e2e-experimental .PHONY: test-e2e-local
test-e2e-experimental: build-e2e-image # run experimental e2e tests test-e2e-local: build-e2e-image # run experimental e2e tests
docker run --rm $(ENVVARS) -e DOCKERD_EXPERIMENTAL=1 \
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
$(E2E_IMAGE_NAME)
.PHONY: test-e2e-non-experimental
test-e2e-non-experimental: build-e2e-image # run non-experimental e2e tests
docker run --rm $(ENVVARS) \ docker run --rm $(ENVVARS) \
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \ --mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \ --mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
@ -146,7 +139,7 @@ test-e2e-non-experimental: build-e2e-image # run non-experimental e2e tests
.PHONY: test-e2e-connhelper-ssh .PHONY: test-e2e-connhelper-ssh
test-e2e-connhelper-ssh: build-e2e-image # run experimental SSH-connection helper e2e tests test-e2e-connhelper-ssh: build-e2e-image # run experimental SSH-connection helper e2e tests
docker run --rm $(ENVVARS) -e DOCKERD_EXPERIMENTAL=1 -e TEST_CONNHELPER=ssh \ docker run --rm $(ENVVARS) -e TEST_CONNHELPER=ssh \
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \ --mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \ --mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
$(E2E_IMAGE_NAME) $(E2E_IMAGE_NAME)

3
e2e/compose-env.experimental.yaml
View File

@ -1,3 +0,0 @@
services:
engine:
command: ["--insecure-registry=registry:5000", "--experimental"]

2
e2e/compose-env.yaml
View File

@ -6,7 +6,7 @@ services:
engine: engine:
image: 'docker:${ENGINE_VERSION:-26.1}-dind' image: 'docker:${ENGINE_VERSION:-26.1}-dind'
privileged: true privileged: true
command: ['--insecure-registry=registry:5000'] command: ['--insecure-registry=registry:5000', '--experimental']
environment: environment:
- DOCKER_TLS_CERTDIR= - DOCKER_TLS_CERTDIR=

2
scripts/test/e2e/run
View File

@ -19,8 +19,6 @@ setup() {
local project=$1 local project=$1
local file=$2 local file=$2
test "${DOCKERD_EXPERIMENTAL:-0}" -eq "1" && file="${file}:./e2e/compose-env.experimental.yaml"
if [ "${TEST_CONNHELPER:-}" = "ssh" ];then if [ "${TEST_CONNHELPER:-}" = "ssh" ];then
test ! -f "${HOME}/.ssh/id_rsa" && ssh-keygen -t rsa -C docker-e2e-dummy -N "" -f "${HOME}/.ssh/id_rsa" -q test ! -f "${HOME}/.ssh/id_rsa" && ssh-keygen -t rsa -C docker-e2e-dummy -N "" -f "${HOME}/.ssh/id_rsa" -q
grep "^StrictHostKeyChecking no" "${HOME}/.ssh/config" > /dev/null 2>&1 || echo "StrictHostKeyChecking no" > "${HOME}/.ssh/config" grep "^StrictHostKeyChecking no" "${HOME}/.ssh/config" > /dev/null 2>&1 || echo "StrictHostKeyChecking no" > "${HOME}/.ssh/config"