From 9006f617402be1d639996b6763b26015efba3e53 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Fri, 9 Jun 2023 13:20:19 +0200
Subject: [PATCH] e2e: test buildx and buildkit edge

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 .github/workflows/e2e.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index bb218dd..2177473 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -39,11 +39,13 @@ jobs:
         buildkit_image:
           - moby/buildkit:buildx-stable-1
           - moby/buildkit:master
+        _merge: dummy
         include:
           -
             name: Distribution
             id: distribution
             type: local
+            _merge: dummy
           -
             name: Docker Hub
             registry: ''
@@ -51,6 +53,7 @@ jobs:
             username_secret: DOCKERHUB_USERNAME
             password_secret: DOCKERHUB_TOKEN
             type: remote
+            _merge: dummy
           -
             name: GitHub
             registry: ghcr.io
@@ -58,6 +61,7 @@ jobs:
             username_secret: GHCR_USERNAME
             password_secret: GHCR_PAT
             type: remote
+            _merge: dummy
           -
             name: GitLab
             registry: registry.gitlab.com
@@ -65,6 +69,7 @@ jobs:
             username_secret: GITLAB_USERNAME
             password_secret: GITLAB_TOKEN
             type: remote
+            _merge: dummy
           -
             name: AWS ECR
             registry: 175142243308.dkr.ecr.us-east-2.amazonaws.com
@@ -72,6 +77,7 @@ jobs:
             username_secret: AWS_ACCESS_KEY_ID
             password_secret: AWS_SECRET_ACCESS_KEY
             type: remote
+            _merge: dummy
           -
             name: AWS ECR Public
             registry: public.ecr.aws
@@ -79,6 +85,7 @@ jobs:
             username_secret: AWS_ACCESS_KEY_ID
             password_secret: AWS_SECRET_ACCESS_KEY
             type: remote
+            _merge: dummy
           -
             name: Google Artifact Registry
             registry: us-east4-docker.pkg.dev
@@ -86,6 +93,7 @@ jobs:
             username_secret: GAR_USERNAME
             password_secret: GAR_JSON_KEY
             type: remote
+            _merge: dummy
           -
             name: Google Container Registry
             registry: gcr.io
@@ -93,6 +101,7 @@ jobs:
             username_secret: GCR_USERNAME
             password_secret: GCR_JSON_KEY
             type: remote
+            _merge: dummy
           -
             name: Azure Container Registry
             registry: officialgithubactions.azurecr.io
@@ -100,6 +109,7 @@ jobs:
             username_secret: AZURE_CLIENT_ID
             password_secret: AZURE_CLIENT_SECRET
             type: remote
+            _merge: dummy
           -
             name: Quay
             registry: quay.io
@@ -107,6 +117,7 @@ jobs:
             username_secret: QUAY_USERNAME
             password_secret: QUAY_TOKEN
             type: remote
+            _merge: dummy
           -
             name: Artifactory
             registry: buildkitghactiontests.jfrog.io
@@ -114,14 +125,17 @@ jobs:
             username_secret: ARTIFACTORY_USERNAME
             password_secret: ARTIFACTORY_TOKEN
             type: remote
+            _merge: dummy
           -
             name: Harbor
             id: harbor
             type: local
+            _merge: dummy
           -
             name: Nexus
             id: nexus
             type: local
+            _merge: dummy
     steps:
       -
         name: Checkout