Merge pull request spidernet-io#3936 from spidernet-io/pr/welan/ciname

rename ci to be easy to understand
ty-dc · Aug 29, 2024 · 2db26bf · 2db26bf
2 parents 8c54ae1 + 8c82584
commit 2db26bf
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/auto-upgrade-ci.yaml b/.github/workflows/auto-upgrade-ci.yaml
@@ -280,7 +280,7 @@ jobs:
                SPIDERPOOL_CONTROLLER_IMAGE_NAME=spiderpool-controller-race
                E2E_SPIDERPOOL_TAG=${{ needs.call_build_old_ci_image.outputs.imageTag }}
             fi
-            make e2e_init_underlay -e E2E_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }} \
+            make e2e_init_spiderpool -e E2E_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }} \
                 -e SPIDERPOOL_AGENT_IMAGE_NAME=${SPIDERPOOL_AGENT_IMAGE_NAME} \
                 -e SPIDERPOOL_CONTROLLER_IMAGE_NAME=${SPIDERPOOL_CONTROLLER_IMAGE_NAME} \
                 -e E2E_SPIDERPOOL_TAG=${E2E_SPIDERPOOL_TAG} \
@@ -344,7 +344,7 @@ jobs:
         if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' }}
         run: |
           RESULT=0
-          make e2e_test_underlay -e E2E_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }}  \
+          make e2e_test_spiderpool -e E2E_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }}  \
               -e E2E_TIMEOUT=${{ env.E2E_TIME_OUT }} \
               -e E2E_IP_FAMILY=dual || RESULT=1
           if ((RESULT==0)) ; then

diff --git a/.github/workflows/e2e-init.yaml b/.github/workflows/e2e-init.yaml
@@ -40,14 +40,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - e2e_init_mode: e2e_init_underlay
-            e2e_test_mode: e2e_test_underlay
-          - e2e_init_mode: e2e_init_cilium_with_ebpf
-            e2e_test_mode: e2e_test_cilium_with_ebpf
+          - e2e_init_mode: e2e_init_spiderpool
+            e2e_test_mode: e2e_test_spiderpool
+          - e2e_init_mode: e2e_init_cilium_ebpfservice
+            e2e_test_mode: e2e_test_cilium_ebpfservice
           - e2e_init_mode: e2e_init_calico
             e2e_test_mode: e2e_test_calico
-          - e2e_init_mode: e2e_init_cilium
-            e2e_test_mode: e2e_test_cilium
+          - e2e_init_mode: e2e_init_cilium_legacyservice
+            e2e_test_mode: e2e_test_cilium_legacyservice
     steps:
       - name: Show system kernel
         run: |
@@ -228,7 +228,7 @@ jobs:
 
       - name: Get the E2E Performance Result For Dual-stack
         id: get_performance
-        if: ${{ inputs.run_e2e == 'true' && inputs.ip_family == 'dual' && matrix.e2e_test_mode == 'e2e_test_underlay' }}
+        if: ${{ inputs.run_e2e == 'true' && inputs.ip_family == 'dual' && matrix.e2e_test_mode == 'e2e_test_spiderpool' }}
         continue-on-error: true
         shell: bash
         run: |

diff --git a/Makefile b/Makefile
@@ -289,7 +289,7 @@ e2e:
 	$(QUIET) TMP=` date +%m%d%H%M%S ` ; E2E_CLUSTER_NAME="spiderpool$${TMP}" ; \
 		echo "begin e2e with cluster $${E2E_CLUSTER_NAME}" ; \
 		make build_image ; \
-		make e2e_init_underlay -e E2E_CLUSTER_NAME=$${E2E_CLUSTER_NAME} ; \
+		make e2e_init_spiderpool -e E2E_CLUSTER_NAME=$${E2E_CLUSTER_NAME} ; \
 		make e2e_test -e E2E_CLUSTER_NAME=$${E2E_CLUSTER_NAME}
 
 
@@ -318,43 +318,43 @@ setup_dualCni_calico:
 setup_dualCni_cilium:
 	$(QUIET)  make -C test init_env_with_release -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=false -e INSTALL_CILIUM=true DISABLE_KUBE_PROXY=true
 
-.PHONY: e2e_init_underlay
-e2e_init_underlay:
+.PHONY: e2e_init_spiderpool
+e2e_init_spiderpool:
 	$(QUIET)  make e2e_init -e INSTALL_OVERLAY_CNI=false -e E2E_SPIDERPOOL_ENABLE_SUBNET=true
 
-.PHONY: e2e_init_cilium_with_ebpf
-e2e_init_cilium_with_ebpf:
-	$(QUIET)  make e2e_init -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=false -e INSTALL_CILIUM=true DISABLE_KUBE_PROXY=true -e E2E_SPIDERPOOL_ENABLE_SUBNET=false
+.PHONY: e2e_init_cilium_ebpfservice
+e2e_init_cilium_ebpfservice:
+	$(QUIET)  make e2e_init -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=false -e INSTALL_CILIUM=true -e DISABLE_KUBE_PROXY=true -e E2E_SPIDERPOOL_ENABLE_SUBNET=false
 
 .PHONY: e2e_init_calico
 e2e_init_calico:
 	$(QUIET)  make e2e_init -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=true -e INSTALL_CILIUM=false -e E2E_SPIDERPOOL_ENABLE_SUBNET=false \
 	E2E_SPIDERPOOL_ENABLE_DRA=true 
 
-.PHONY: e2e_init_cilium
-e2e_init_cilium:
-	$(QUIET)  make e2e_init -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=false -e INSTALL_CILIUM=true -e E2E_SPIDERPOOL_ENABLE_SUBNET=false
+.PHONY: e2e_init_cilium_legacyservice
+e2e_init_cilium_legacyservice:
+	$(QUIET)  make e2e_init -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=false -e INSTALL_CILIUM=true -e DISABLE_KUBE_PROXY=false -e E2E_SPIDERPOOL_ENABLE_SUBNET=false
 
 
 .PHONY: e2e_test
 e2e_test:
 	$(QUIET)  make -C test e2e_test
 
-.PHONY: e2e_test_underlay
-e2e_test_underlay:
+.PHONY: e2e_test_spiderpool
+e2e_test_spiderpool:
 	$(QUIET)  make e2e_test -e INSTALL_OVERLAY_CNI=false -e E2E_SPIDERPOOL_ENABLE_SUBNET=true 
 
 .PHONY: e2e_test_calico
 e2e_test_calico:
 	$(QUIET)  make e2e_test -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=true -e INSTALL_CILIUM=false -e E2E_GINKGO_LABELS=overlay,dra \
 	E2E_SPIDERPOOL_ENABLE_DRA=true 
 
-.PHONY: e2e_test_cilium
-e2e_test_cilium:
+.PHONY: e2e_test_cilium_legacyservice
+e2e_test_cilium_legacyservice:
 	$(QUIET)  make e2e_test -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=false -e INSTALL_CILIUM=true -e E2E_GINKGO_LABELS=overlay
 
-.PHONY: e2e_test_cilium_with_ebpf
-e2e_test_cilium_with_ebpf:
+.PHONY: e2e_test_cilium_ebpfservice
+e2e_test_cilium_ebpfservice:
 	$(QUIET)  make e2e_test -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=false -e INSTALL_CILIUM=true DISABLE_KUBE_PROXY=true -e E2E_GINKGO_LABELS=ebpf
 
 .PHONY: preview_doc

diff --git a/docs/develop/contributing.md b/docs/develop/contributing.md
@@ -33,7 +33,7 @@
 
     | Goal                                                 | Command for setup cluster                            | Command for running E2E test                         |
     |------------------------------------------------------|------------------------------------------------------|------------------------------------------------------|
-    | test spiderpool                                      | make    e2e_init_underlay                            | make e2e_test_underlay                               |
+    | test spiderpool                                      | make    e2e_init_spiderpool                            | make e2e_test_spiderpool                               |
     | test for dual-CNI cluster with calico and spiderpool | make    e2e_init_overlay_calico                      | make e2e_test_overlay_calico                         |
     | test for dual-CNI cluster with calico and spiderpool | make    e2e_init_overlay_cilium                      | make e2e_test_overlay_cilium                         |
 
@@ -43,7 +43,7 @@
 
         # setup the kind cluster of dual-stack
         # !!! images is tested by commit sha, so make sure the commit is submit locally
-        $ make e2e_init_underlay
+        $ make e2e_init_spiderpool
           .......
           -----------------------------------------------------------------------------------------------------
              succeeded to setup cluster spider
@@ -53,20 +53,20 @@
           -----------------------------------------------------------------------------------------------------
 
         # setup the kind cluster of ipv4-only
-        $ make e2e_init_underlay -e E2E_IP_FAMILY=ipv4
+        $ make e2e_init_spiderpool -e E2E_IP_FAMILY=ipv4
 
         # setup the kind cluster of ipv6-only
-        $ make e2e_init_underlay -e E2E_IP_FAMILY=ipv6
+        $ make e2e_init_spiderpool -e E2E_IP_FAMILY=ipv6
 
         # for china developer not able access ghcr.io
         # it pulls images from another image registry and just use http proxy to pull chart 
-        $ make e2e_init_underlay  -e E2E_CHINA_IMAGE_REGISTRY=true -e HTTP_PROXY=http://${ADDR}
+        $ make e2e_init_spiderpool  -e E2E_CHINA_IMAGE_REGISTRY=true -e HTTP_PROXY=http://${ADDR}
 
         # setup cluster with calico cni
         $ make e2e_init_calico -e E2E_CHINA_IMAGE_REGISTRY=true -e HTTP_PROXY=http://${ADDR}
 
         # setup cluster with cilium cni
-        $ make e2e_init_cilium  -e E2E_CHINA_IMAGE_REGISTRY=true -e HTTP_PROXY=http://${ADDR}
+        $ make e2e_init_cilium_legacyservice  -e E2E_CHINA_IMAGE_REGISTRY=true -e HTTP_PROXY=http://${ADDR}
 
     if it is expected to test a specified released images, run following commands :
 
@@ -77,7 +77,7 @@
         $ docker pull ${MULTUS_IMAGE_NAME}:${IMAGE_TAG}
 
         # setup the cluster with the specified image
-        $ make e2e_init_underlay -e E2E_SPIDERPOOL_TAG=${IMAGE_TAG} \
+        $ make e2e_init_spiderpool -e E2E_SPIDERPOOL_TAG=${IMAGE_TAG} \
                 -e SPIDERPOOL_AGENT_IMAGE_NAME=${AGENT_IMAGE_NAME}   \
                 -e SPIDERPOOL_CONTROLLER_IMAGE_NAME=${CONTROLLER_IMAGE_NAME} \
                 -e E2E_MULTUS_IMAGE_NAME=${MULTUS_IMAGE_NAME}
@@ -88,29 +88,29 @@
     Example for running the e2e test:
 
         # run all e2e test on dual-stack cluster
-        $ make e2e_test_underlay
+        $ make e2e_test_spiderpool
 
         # run all e2e test on ipv4-only cluster
-        $ make e2e_test_underlay -e E2E_IP_FAMILY=ipv4
+        $ make e2e_test_spiderpool -e E2E_IP_FAMILY=ipv4
 
         # run all e2e test on ipv6-only cluster
-        $ make e2e_test_underlay -e E2E_IP_FAMILY=ipv6
+        $ make e2e_test_spiderpool -e E2E_IP_FAMILY=ipv6
 
         # run smoke test
-        $ make e2e_test_underlay -e E2E_GINKGO_LABELS=smoke
+        $ make e2e_test_spiderpool -e E2E_GINKGO_LABELS=smoke
 
         # after finishing e2e case , you could test repeated for debugging flaky tests
         # example: run a case repeatedly
-        $ make e2e_test_underlay -e E2E_GINKGO_LABELS=CaseLabel -e GINKGO_OPTION="--repeat=10 "
+        $ make e2e_test_spiderpool -e E2E_GINKGO_LABELS=CaseLabel -e GINKGO_OPTION="--repeat=10 "
 
         # example: run a case until fails
-        $ make e2e_test_underlay -e GINKGO_OPTION=" --label-filter=CaseLabel --until-it-fails "
+        $ make e2e_test_spiderpool -e GINKGO_OPTION=" --label-filter=CaseLabel --until-it-fails "
 
         # Run all e2e tests for enableSpiderSubnet=false cluster
         $ make e2e_test_calico
 
         # Run all e2e tests for enableSpiderSubnet=false cluster
-        $ make e2e_test_cilium 
+        $ make e2e_test_cilium_legacyservice 
 
         $ ls e2ereport.json