Merge branch 'volcano-sh:master' into master

volcano-sh · Jan 2, 2025 · 6f17c64 · 6f17c64
2 parents 996d0c9 + 5a7374d
commit 6f17c64
Show file tree

Hide file tree

Showing 22 changed files with 771 additions and 27 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,42 @@
+#### What type of PR is this?
+<!--
+Add one of the following kinds:
+/kind bug
+/kind cleanup
+/kind documentation
+/kind feature
+/kind failing-test
+/kind flake
+
+Optionally add one of the following areas, help us further classify and filter PRs:
+/area scheduling
+/area controllers
+/area cli
+/area dependency
+/area webhooks
+/area deploy
+/area documentation
+/area performance
+/area test
+-->
+
+#### What this PR does / why we need it:
+
+#### Which issue(s) this PR fixes:
+<!--
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+Notice that do not add `Fixes` if the issue is associated with multiple PRs.
+-->
+Fixes #
+
+#### Special notes for your reviewer:
+
+#### Does this PR introduce a user-facing change?
+<!--
+If no, just write "NONE" in the release-note block below.
+If yes, a release note is required.
+-->
+```release-note
+
+```
diff --git a/.github/workflows/e2e_parallel_jobs.yaml b/.github/workflows/e2e_parallel_jobs.yaml
@@ -38,4 +38,20 @@ jobs:
 
       - name: Run E2E Tests
         run: |
-          make e2e-test-jobp CC=/usr/local/musl/bin/musl-gcc
+          make e2e-test-jobp CC=/usr/local/musl/bin/musl-gcc
+
+      - name: export logs for e2e parallel jobs
+        if: failure()
+        run: |
+          export ARTIFACTS_PATH=${{ github.workspace }}/e2e-parallel-jobs-logs
+          mkdir -p $ARTIFACTS_PATH
+          
+          kdir -p $ARTIFACTS_PATH/integration
+          kind export logs --name=integration $ARTIFACTS_PATH/integration
+
+      - name: upload e2e parallel jobs logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: volcano_e2e_parallel_jobs_logs
+          path: ${{ github.workspace }}/e2e-parallel-jobs-logs
diff --git a/.github/workflows/e2e_scheduling_actions.yaml b/.github/workflows/e2e_scheduling_actions.yaml
@@ -38,4 +38,20 @@ jobs:
 
       - name: Run E2E Tests
         run: |
-          make e2e-test-schedulingaction CC=/usr/local/musl/bin/musl-gcc
+          make e2e-test-schedulingaction CC=/usr/local/musl/bin/musl-gcc
+
+      - name: export logs for e2e scheduling actions
+        if: failure()
+        run: |
+          export ARTIFACTS_PATH=${{ github.workspace }}/e2e-scheduling-actions-logs
+          mkdir -p $ARTIFACTS_PATH
+          
+          kdir -p $ARTIFACTS_PATH/integration
+          kind export logs --name=integration $ARTIFACTS_PATH/integration
+
+      - name: upload e2e scheduling actions logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: volcano_e2e_scheduling_actions_logs
+          path: ${{ github.workspace }}/e2e-scheduling-actions-logs
diff --git a/.github/workflows/e2e_scheduling_basic.yaml b/.github/workflows/e2e_scheduling_basic.yaml
@@ -39,3 +39,19 @@ jobs:
       - name: Run E2E Tests
         run: |
           make e2e-test-schedulingbase CC=/usr/local/musl/bin/musl-gcc
+
+      - name: export logs for e2e scheduling basic
+        if: failure()
+        run: |
+          export ARTIFACTS_PATH=${{ github.workspace }}/e2e-scheduling-basic-logs
+          mkdir -p $ARTIFACTS_PATH
+          
+          kdir -p $ARTIFACTS_PATH/integration
+          kind export logs --name=integration $ARTIFACTS_PATH/integration
+
+      - name: upload e2e scheduling basic logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: volcano_e2e_scheduling_basic_logs
+          path: ${{ github.workspace }}/e2e-scheduling-basic-logs
diff --git a/.github/workflows/e2e_sequence.yaml b/.github/workflows/e2e_sequence.yaml
@@ -38,4 +38,20 @@ jobs:
 
       - name: Run E2E Tests
         run: |
-          make e2e-test-jobseq CC=/usr/local/musl/bin/musl-gcc
+          make e2e-test-jobseq CC=/usr/local/musl/bin/musl-gcc
+
+      - name: export logs for e2e sequence
+        if: failure()
+        run: |
+          export ARTIFACTS_PATH=${{ github.workspace }}/e2e-sequence-logs
+          mkdir -p $ARTIFACTS_PATH
+          
+          kdir -p $ARTIFACTS_PATH/integration
+          kind export logs --name=integration $ARTIFACTS_PATH/integration
+
+      - name: upload e2e sequence logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: volcano_e2e_sequence_logs
+          path: ${{ github.workspace }}/e2e-sequence-logs
diff --git a/.github/workflows/e2e_spark.yaml b/.github/workflows/e2e_spark.yaml
@@ -113,3 +113,19 @@ jobs:
       if: always()
       run: |
         minikube delete
+
+    - name: export logs for e2e spark
+      if: failure()
+      run: |
+        export ARTIFACTS_PATH=${{ github.workspace }}/e2e-spark-logs
+        mkdir -p $ARTIFACTS_PATH
+            
+        kdir -p $ARTIFACTS_PATH/integration
+        kind export logs --name=integration $ARTIFACTS_PATH/integration
+
+    - name: upload e2e spark logs
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: volcano_e2e_spark_logs
+        path: ${{ github.workspace }}/e2e-spark-logs
diff --git a/.github/workflows/e2e_vcctl.yaml b/.github/workflows/e2e_vcctl.yaml
@@ -38,4 +38,20 @@ jobs:
 
       - name: Run E2E Tests
         run: |
-          make e2e-test-vcctl CC=/usr/local/musl/bin/musl-gcc
+          make e2e-test-vcctl CC=/usr/local/musl/bin/musl-gcc
+
+      - name: export logs for e2e vcctl
+        if: failure()
+        run: |
+          export ARTIFACTS_PATH=${{ github.workspace }}/e2e-vcctl-logs
+          mkdir -p $ARTIFACTS_PATH
+          
+          kdir -p $ARTIFACTS_PATH/integration
+          kind export logs --name=integration $ARTIFACTS_PATH/integration
+
+      - name: upload e2e vcctl logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: volcano_e2e_vcctl_logs
+          path: ${{ github.workspace }}/e2e-vcctl-logs