From c26090bd3eb4114d9f3d883c623af1120a981f93 Mon Sep 17 00:00:00 2001
From: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
Date: Mon, 24 Feb 2025 14:29:48 +0100
Subject: [PATCH] workflow/e2e: only run experimental daemon

Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
---
 .github/workflows/e2e.yml         |  5 ++---
 docker.Makefile                   | 15 ++++-----------
 e2e/compose-env.experimental.yaml |  3 ---
 e2e/compose-env.yaml              |  2 +-
 scripts/test/e2e/run              |  2 --
 5 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 e2e/compose-env.experimental.yaml

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index caecaea8fa..12af83fce3 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -25,14 +25,13 @@ on:
   pull_request:
 
 jobs:
-  e2e:
+  tests:
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         target:
-          - non-experimental
-          - experimental
+          - local
           - connhelper-ssh
         base:
           - alpine
diff --git a/docker.Makefile b/docker.Makefile
index 011bfd9b68..de4538338e 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -128,17 +128,10 @@ build-e2e-image:
 	IMAGE_NAME=$(E2E_IMAGE_NAME) VERSION=$(VERSION) docker buildx bake e2e-image
 
 .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
-test-e2e-experimental: 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
+.PHONY: test-e2e-local
+test-e2e-local: build-e2e-image # run experimental e2e tests
 	docker run --rm $(ENVVARS) \
 		--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
 		--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
 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=/var/run/docker.sock,dst=/var/run/docker.sock \
 		$(E2E_IMAGE_NAME)
diff --git a/e2e/compose-env.experimental.yaml b/e2e/compose-env.experimental.yaml
deleted file mode 100644
index 0fac9fb20e..0000000000
--- a/e2e/compose-env.experimental.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-services:
-  engine:
-      command: ["--insecure-registry=registry:5000", "--experimental"]
diff --git a/e2e/compose-env.yaml b/e2e/compose-env.yaml
index 7feb2a0a70..204d08e7b0 100644
--- a/e2e/compose-env.yaml
+++ b/e2e/compose-env.yaml
@@ -6,7 +6,7 @@ services:
   engine:
       image: 'docker:${ENGINE_VERSION:-26.1}-dind'
       privileged: true
-      command: ['--insecure-registry=registry:5000']
+      command: ['--insecure-registry=registry:5000', '--experimental']
       environment:
         - DOCKER_TLS_CERTDIR=
 
diff --git a/scripts/test/e2e/run b/scripts/test/e2e/run
index e2c651ea80..a13359660f 100755
--- a/scripts/test/e2e/run
+++ b/scripts/test/e2e/run
@@ -19,8 +19,6 @@ setup() {
     local project=$1
     local file=$2
 
-    test "${DOCKERD_EXPERIMENTAL:-0}" -eq "1" && file="${file}:./e2e/compose-env.experimental.yaml"
-
     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
         grep "^StrictHostKeyChecking no" "${HOME}/.ssh/config" > /dev/null 2>&1 || echo "StrictHostKeyChecking no" > "${HOME}/.ssh/config"