From 195a200953c46fe115e6fe4592c4073469fc69e1 Mon Sep 17 00:00:00 2001
From: Vee Zhang <14001308+veezhang@users.noreply.github.com>
Date: Wed, 8 Nov 2023 19:53:05 +0800
Subject: [PATCH] fix

---
 .github/workflows/e2e.yml     | 13 ++++++++++---
 tests/e2e/envfuncsext/helm.go |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index a2a267c5..fbc66351 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -8,6 +8,7 @@ on:
       ref:
         description: "Acceptable content: branch/tag/commit ID."
         required: true
+        default: 'ci-dev'
 
 defaults:
   run:
@@ -19,6 +20,12 @@ jobs:
     runs-on:
       - self-hosted
       - nebula
+    container:
+      image: docker:dind
+      volumes:
+        - /var/lib/docker:/var/lib/docker
+      options: --privileged
+
 #     container:
 #       image: reg.vesoft-inc.com/ci/ubuntu:20.04-docker
 #       volumes:
@@ -33,7 +40,6 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: azure/setup-helm@v3
       - uses: docker/login-action@v2
         with:
           registry: ${{ secrets.HARBOR_REGISTRY }}
@@ -41,6 +47,7 @@ jobs:
           password: ${{ secrets.HARBOR_PASSWORD }}
       - 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
@@ -53,9 +60,9 @@ jobs:
           make e2e E2EARGS="-labels category=tools -v=5"
         env:
           E2E_OPERATOR_IMAGE: reg.vesoft-inc.com/cloud-dev/nebula-operator:snap-1.25
-          E2E_OPERATOR_INSTALL: "false"
+          E2E_OPERATOR_INSTALL: "true"
           E2E_NC_VERSION: v3.6.0
           E2E_NC_GRAPHD_IMAGE: reg.vesoft-inc.com/vesoft-ent/nebula-graphd-ent
           E2E_NC_METAD_IMAGE: reg.vesoft-inc.com/vesoft-ent/nebula-metad-ent
           E2E_NC_STORAGED_IMAGE: reg.vesoft-inc.com/vesoft-ent/nebula-storaged-ent
-          E2E_NC_LICENSE_MANAGER_URL: license.vesoft-inc.com:9119
\ No newline at end of file
+          E2E_NC_LICENSE_MANAGER_URL: license.vesoft-inc.com:9119
diff --git a/tests/e2e/envfuncsext/helm.go b/tests/e2e/envfuncsext/helm.go
index 62d4504a..60fbc0bb 100644
--- a/tests/e2e/envfuncsext/helm.go
+++ b/tests/e2e/envfuncsext/helm.go
@@ -36,6 +36,7 @@ func (o *HelmOptions) WithOptions(opts ...HelmOption) *HelmOptions {
 	}
 	return o
 }
+
 func (o *HelmOptions) RawHelmOpts() *helm.Opts {
 	option := &helm.Opts{}
 	for _, op := range o.HelmOptions {