From 05b242f59c119b9eb17258232f610b1f22a27f45 Mon Sep 17 00:00:00 2001
From: Vee Zhang <14001308+veezhang@users.noreply.github.com>
Date: Thu, 9 Nov 2023 19:54:41 +0800
Subject: [PATCH] fix

---
 .github/workflows/e2e.yml | 52 +++++++--------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index af6921d9..7af5cab1 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -20,45 +20,12 @@ jobs:
     runs-on:
       - self-hosted
       - nebula
-#     container:
-#       image: reg.vesoft-inc.com/ci/ubuntu:22.04-dind
-#       volumes:
-#         - /var/lib/dind:/var/lib/docker
-#       options: --privileged
-#       env:
-#         DOCKER_HOST: unix:///.docker.sock
-#     services:
-#       dind:
-#         image: docker:dind
-#         env:
-#           DOCKER_TLS_CERTDIR: "" # disable TLS
-#         volumes:
-#           - /var/lib/dind:/var/lib/docker
-#         ports:
-#           - 2375:2375
-#           - 2376:2376
-#         options: >-
-#           --privileged
-#           --health-cmd "docker info"
-#           --health-interval 10s
-#           --health-timeout 5s
-#           --health-retries 5
-#     container:
-#       image: reg.vesoft-inc.com/ci/ubuntu:22.04-dind # docker:dind
-#       volumes:
-#         - /var/lib/dind:/var/lib/docker
-#       options: --privileged
-#       env:
-#         DOCKER_HOST: unix:///.docker.sock
-
-#     container:
-#       image: reg.vesoft-inc.com/ci/ubuntu:20.04-docker
-#       volumes:
-#         - /var/run/docker.sock:/var/run/docker.sock
     steps:
       - uses: webiny/action-post-run@3.0.0
         with:
-          run: sh -c "find . -mindepth 1 -delete"
+          run: |
+            kind get clusters | grep '^e2e-' | xargs -n1 kind delete cluster --name
+            sh -c "find . -mindepth 1 -delete"
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.ref }}
@@ -73,18 +40,17 @@ jobs:
       - run: |
             git config --global --add safe.directory $(pwd)
             curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
-#       - name: build operator image
-#         run: |
-#           export DOCKER_REPO=reg.vesoft-inc.com/ci
-#           export IMAGE_TAG=ci-e2e
-#           make docker-multiarch
+      - name: build operator image
+        run: |
+          export DOCKER_REPO=reg.vesoft-inc.com/ci
+          export IMAGE_TAG=ci-e2e
+          make docker-multiarch
       - name: e2e
         run: |
           export E2E_DOCKER_CONFIG_JSON_SECRET=`cat ~/.docker/config.json| base64 -w 0`
           make e2e E2EARGS="-labels category=tools -v=5"
         env:
-          # DOCKER_HOST: dind:2375
-          E2E_OPERATOR_IMAGE: reg.vesoft-inc.com/cloud-dev/nebula-operator:snap-1.25
+          E2E_OPERATOR_IMAGE: reg.vesoft-inc.com/ci/nebula-operator:ci-e2e
           E2E_OPERATOR_INSTALL: "true"
           E2E_NC_VERSION: v3.6.0
           E2E_NC_GRAPHD_IMAGE: reg.vesoft-inc.com/vesoft-ent/nebula-graphd-ent