feat: split e2e test in workflow (#380)

Signed-off-by: Mengchenchen<meng.chenchen@99cloud.net>
kubeclipper · Mar 3, 2023 · a528981 · a528981
1 parent 45255f6
commit a528981
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 20 deletions.
diff --git a/.github/workflows/full-e2e-test.yml b/.github/workflows/full-e2e-test.yml
@@ -28,6 +28,7 @@ jobs:
           port: ${{ secrets.CHJ_REMOTE_PORT }}
           script: |
             rm -rf /root/console
+            rm -rf /root/console-others
 
       - name: Copy
         uses: appleboy/scp-action@master
@@ -41,16 +42,11 @@ jobs:
           target: "/root/console"
 
   Deploy:
-    name: Deploy and Run e2e
+    name: Deploy
     runs-on: ubuntu-latest
 
     steps:
 
-      - name: Get branch name
-        id: extract_branch
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-
       - name: Deploy
         uses: appleboy/ssh-action@master
         with:
@@ -63,10 +59,10 @@ jobs:
             set -e
             sh /root/deploy-release-1.3.sh
 
-      - name: Run e2e
+      - name: install dependence
         uses: appleboy/ssh-action@master
         with:
-          command_timeout: 120m
+          command_timeout: 60m
           host: ${{ secrets.CHJ_REMOTE_HOST }}
           username: root
           key: ${{ secrets.CHJ_REMOTE_KEY }}
@@ -76,20 +72,89 @@ jobs:
             pushd /root/console/github/workspace
             yarn config set registry https://registry.npm.taobao.org/
             yarn install
+
+
+  cluster:
+    name: e2e cluster
+    runs-on: ubuntu-latest
+    needs: Deploy
+
+    steps:
+
+      - name: Get branch name
+        id: extract_branch
+        shell: bash
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+
+      - name: Run e2e cluster
+        uses: appleboy/ssh-action@master
+        with:
+          command_timeout: 120m
+          host: ${{ secrets.CHJ_REMOTE_HOST }}
+          username: root
+          key: ${{ secrets.CHJ_REMOTE_KEY }}
+          port: ${{ secrets.CHJ_REMOTE_PORT }}
+          script: |
+            set -e
+            pushd /root/console/github/workspace
+            cp cypress/config/config-cluster.yaml cypress/config/local_config.yaml
+            sed -i "s/localhost/172.20.139.233/" cypress/config/config.yaml
+            sh tools/e2e-smoke.sh
+            ssh root@172.16.30.27 "mkdir -pv /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}"/cluster/
+            scp testcases-cases.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/cluster/
+            scp testcases-e2e-summary.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/cluster/
+            scp cypress/report/merge-report-cluster.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/cluster/
+            scp cypress/report/merge-report-cluster.json root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/cluster/
+            ssh root@172.16.30.27 "rm -rf /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/cluster/assets"
+            scp -r cypress/report/assets root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/cluster/
+            if [ -d "cypress/screenshots" ];then
+            ssh root@172.16.30.27 "rm -rf /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/cluster/screenshots"
+            scp -r cypress/screenshots root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/cluster/
+            echo e2e-test-cluster fail
+            exit 110
+            else
+            echo e2e-test-cluster successfully
+            fi
+
+  others:
+    name: e2e others
+    runs-on: ubuntu-latest
+    needs: Deploy
+
+    steps:
+
+      - name: Get branch name
+        id: extract_branch
+        shell: bash
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+
+      - name: Run e2e others
+        uses: appleboy/ssh-action@master
+        with:
+          command_timeout: 120m
+          host: ${{ secrets.CHJ_REMOTE_HOST }}
+          username: root
+          key: ${{ secrets.CHJ_REMOTE_KEY }}
+          port: ${{ secrets.CHJ_REMOTE_PORT }}
+          script: |
+            set -e
+            cp -r /root/console /root/console-others
+            pushd /root/console-others/github/workspace
+            cp cypress/config/config-others.yaml cypress/config/local_config.yaml
             sed -i "s/localhost/172.20.139.233/" cypress/config/config.yaml
             sh tools/e2e-smoke.sh
-            ssh root@172.16.30.27 "mkdir -pv /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}"
-            scp testcases-cases.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/
-            scp testcases-e2e-summary.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/
-            scp cypress/report/merge-report.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/
-            scp cypress/report/merge-report.json root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/
-            ssh root@172.16.30.27 "rm -rf /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/assets"
-            scp -r cypress/report/assets root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/
+            ssh root@172.16.30.27 "mkdir -pv /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}"/others/
+            scp testcases-cases.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/others/
+            scp testcases-e2e-summary.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/others/
+            scp cypress/report/merge-report.html root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/others/
+            scp cypress/report/merge-report.json root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/others/
+            ssh root@172.16.30.27 "rm -rf /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/others/assets"
+            scp -r cypress/report/assets root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/others/
             if [ -d "cypress/screenshots" ];then
-            ssh root@172.16.30.27 "rm -rf /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/screenshots"
-            scp -r cypress/screenshots root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/
-            echo e2e-test fail
+            ssh root@172.16.30.27 "rm -rf /var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/others/screenshots"
+            scp -r cypress/screenshots root@172.16.30.27:/var/www/html/caas-test-case/github/${{ steps.extract_branch.outputs.branch }}/others/
+            echo e2e-test-others fail
             exit 110
             else
-            echo e2e-test successfully
+            echo e2e-test-others successfully
             fi
diff --git a/cypress/e2e/pages/cluster/template.cy.js b/cypress/e2e/pages/cluster/template.cy.js
@@ -163,7 +163,7 @@ describe('模版管理', () => {
     cy.checkTableRowLength(1);
   });
 
-  // nfs 模版添加
+  // nfs 模版删除
   it(...testCase('集群管理-模版管理-插件模版-删除-1').smoke().value(), () => {
     cy.visitPage('/cluster/template');
     cy.clickByDetailTabs('nfs-csi 模版');