Speed up GitHub action runs and save resources

- Require short running actions (golangci, test, build) before starting slower virtual-k8s-cluster and only run virtual-ocp when virtual-k8s-cluster succeed - Allow cancellation These two changes together reduce the amount of resources used Signed-off-by: Sebastian Sch <sebassch@gmail.com>
k8snetworkplumbingwg · Oct 2, 2023 · c5770d0 · c5770d0
1 parent d8a33a8
commit c5770d0
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 50 deletions.
diff --git a/.github/workflows/go.yml → .github/workflows/test.yml b/.github/workflows/go.yml → .github/workflows/test.yml
@@ -1,7 +1,11 @@
-name: Go
+name: Test SR-IOV Operator
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
 
   build:
@@ -88,3 +92,56 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         path-to-lcov: lcov.out
+
+  virtual-k8s-cluster:
+    name: k8s
+    needs: [
+      build,
+      test,
+      golangci,
+    ]
+    runs-on: [ sriov ]
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Go 1.20
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.x
+
+      - name: run test
+        run: make test-e2e-conformance-virtual-k8s-cluster-ci
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: k8s-artifact
+          path: ./k8s-artifacts
+
+  virtual-ocp:
+    name: ocp
+    needs: [
+      build,
+      test,
+      golangci,
+    ]
+
+    runs-on: [ ocp ]
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Go 1.20
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.x
+
+      - name: run test
+        run: make test-e2e-conformance-virtual-ocp-cluster-ci
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: ocp-artifact
+          path: ./ocp-artifacts
diff --git a/.github/workflows/virtual-cluster.yml b/.github/workflows/virtual-cluster.yml
diff --git a/hack/run-e2e-conformance-virtual-cluster.sh b/hack/run-e2e-conformance-virtual-cluster.sh
@@ -347,6 +347,5 @@ hack/deploy-wait.sh
 
 if [ -z $SKIP_TEST ]; then
   echo "## run sriov e2e conformance tests"
-  SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/artifacts hack/run-e2e-conformance.sh
-  tar -zcvf artifacts.tar.gz ./artifacts
+  SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/k8s-artifacts hack/run-e2e-conformance.sh
 fi
diff --git a/hack/run-e2e-conformance-virtual-ocp.sh b/hack/run-e2e-conformance-virtual-ocp.sh
@@ -235,6 +235,5 @@ hack/deploy-wait.sh
 
 if [ -z $SKIP_TEST ]; then
   echo "## run sriov e2e conformance tests"
-  SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/artifacts hack/run-e2e-conformance.sh
-  tar -zcvf artifacts.tar.gz `pwd`/artifacts
+  SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/ocp-artifacts hack/run-e2e-conformance.sh
 fi