fix

.github/workflows/e2e.yml

@@ -8,21 +8,47 @@ on:
       ref:
         description: "Acceptable content: branch/tag/commit ID."
         required: true
+        default: 'ci-dev'
 
 defaults:
   run:
     shell: bash
 
 jobs:
-  package:
-    name: build package
+  e2e:
+    name: e2e
     runs-on:
       - self-hosted
       - nebula
     container:
-      image: reg.vesoft-inc.com/ci/ubuntu:20.04-docker
+      image: reg.vesoft-inc.com/ci/ubuntu:22.04-dind
       volumes:
-        - /var/run/docker.sock:/var/run/docker.sock
+        - /var/lib/dind:/var/lib/docker
+    services:
+      dind:
+        image: docker:dind
+        env:
+          DOCKER_TLS_CERTDIR: "" # disable TLS
+        volumes:
+          - /var/lib/dind:/var/lib/docker
+        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/[email protected]
         with:
@@ -32,21 +58,32 @@ jobs:
           ref: ${{ github.event.inputs.ref }}
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20
+          go-version: "1.20"
       - uses: docker/login-action@v2
         with:
           registry: ${{ secrets.HARBOR_REGISTRY }}
           username: ${{ secrets.HARBOR_USERNAME }}
           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
+#           export IMAGE_TAG=ci-e2e
+#           make docker-multiarch
       - name: e2e
         run: |
+          sleep 10000
+          export KIND_EXPERIMENTAL_DOCKER_NETWORK=${{ job.container.network }}
           export E2E_DOCKER_CONFIG_JSON_SECRET=`cat ~/.docker/config.json| base64 -w 0`
-          make e2e  E2EARGS="-labels category=tools -v=5"
+          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_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
+          E2E_NC_LICENSE_MANAGER_URL: license.vesoft-inc.com:9119

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 {