From 58442045f33e3f38541150703cfe62b5d075cd58 Mon Sep 17 00:00:00 2001
From: Avimitin <dev@avimit.in>
Date: Sun, 30 Jul 2023 00:27:46 +0800
Subject: [PATCH] [tests] Improve parallel case building & packaging

* script: use bucket id as matrix name
* workflows: use matrix to parallel test case building
* makefile: add new target for the script

Signed-off-by: Avimitin <dev@avimit.in>
---
 .github/scripts/ci.sc              | 12 ++++++--
 .github/workflows/gen-test-elf.yml | 48 ++++++++++++++++++++++++++++--
 Makefile                           | 10 +++++--
 3 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/ci.sc b/.github/scripts/ci.sc
index ce312e829..d84d38176 100644
--- a/.github/scripts/ci.sc
+++ b/.github/scripts/ci.sc
@@ -110,7 +110,8 @@ def buildTestCases(testSrcDir: os.Path, outDir: os.Path, taskBucket: String) = {
 // Example:
 //
 // ```bash
-// # When $RUNNER=3, this will write the string '{ "include": [ {"name": "task1,task2"}, {"name": "task3,task4"}, {"name": "task5,task6"} ] }'
+// # When $RUNNER=2, this will write the string
+// # '{ "include": [ {"name": "bucket0", "tests": "task1,task2"}, {"name": "bucket1", "tests": "task3,task4"} ] }'
 // # into test-case-matrix.json.
 // amm ci.sc genTestBuckets ./tests $RUNNER ./test-case-matrix.json
 // ```
@@ -129,7 +130,14 @@ def genTestBuckets(testSrcDir: os.Path, bucketSize: Int, outFile: Option[os.Path
   if (outFile.isEmpty) {
     println(allTasks.mkString(","))
   } else {
-    writeJson(buckets(allTasks, bucketSize), outFile.get)
+    val genBuckets = buckets(allTasks, bucketSize)
+    val json = ujson.Obj("include" -> genBuckets.zipWithIndex.map(
+      elem => {
+        val (tests, i) = elem
+        ujson.Obj(s"name" -> ujson.Str(s"bucket$i"), s"tests" -> ujson.Str(tests))
+      }
+    ))
+    os.write.over(outFile.get, json)
     println(outFile.get)
   }
 }
diff --git a/.github/workflows/gen-test-elf.yml b/.github/workflows/gen-test-elf.yml
index c9929cc6c..408312ecd 100644
--- a/.github/workflows/gen-test-elf.yml
+++ b/.github/workflows/gen-test-elf.yml
@@ -9,8 +9,35 @@ on:
     paths:
       - 'tests/**'
 jobs:
+  gen-matrix:
+    name: Generate test matrix
+    runs-on: [self-hosted, linux]
+    env:
+      RUNNERS: 16
+    outputs:
+      ci-tests: ${{ steps.ci-tests.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - run: sudo -E .github/setup-actions.sh
+        env:
+          AWS_CREDENTIALS: ${{secrets.AWS_CREDENTIALS}}
+          CACHE_PRIV_KEY: ${{secrets.CACHE_PRIV_KEY}}
+          CACHE_DOMAIN: ${{secrets.CACHE_DOMAIN}}
+      - uses: cachix/install-nix-action@v19
+        with:
+          install_url: https://releases.nixos.org/nix/nix-2.13.3/install
+          nix_path: nixpkgs=channel:nixos-unstable
+      - id: ci-tests
+        run: nix-shell -p ammonite --run 'make gen-test-case-bucket'
+
   gen-test-artifacts:
+    needs: [gen-matrix]
     runs-on: [self-hosted, linux]
+    strategy:
+      fail-fast: true
+      matrix: ${{ fromJSON(needs.gen-matrix.outputs.ci-tests) }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -28,8 +55,25 @@ jobs:
             post-build-hook = /etc/nix/upload-to-cache.sh
             trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= minio.inner.fi.c-3.moe:gDg5SOIH65O0tTV89dUawME5BTmduWWaA7as/cqvevM=
             extra-substituters = https://${{secrets.CACHE_DOMAIN}}/nix
-      - run: nix develop .#testcase -c make dist-test-case
+      - run: nix develop -c make build-test-cases TESTS=${{ matrix.tests }} OUT_DIR=tests-out-${{ matrix.name }}
+      - uses: actions/upload-artifact@v3
+        with:
+          name: all-test-out
+          path: ./tests-out-*
+
+  dist-test-artifacts:
+    needs: [gen-test-artifacts]
+    runs-on: [self-hosted, linux]
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: all-test-out
+      - run: |
+          mkdir -p vector-test-case/configs
+          mkdir -p vector-test-case/cases
+          cp -r tests-out-*/configs/* vector-test-case/configs/
+          cp -r tests-out-*/cases/* vector-test-case/cases/
       - uses: actions/upload-artifact@v3
         with:
           name: vector-test-case
-          path: vector-test-case.tar.gz
+          path: vector-test-case
diff --git a/Makefile b/Makefile
index 0c8f30f52..533d907ee 100644
--- a/Makefile
+++ b/Makefile
@@ -55,5 +55,11 @@ ci-all-tests:
 gen-tests-artifacts:
 	amm .github/scripts/ci.sc genTestElf ./tests ./tests-artifacts
 
-dist-test-case:
-	cp $(TESTS_OUT_DIR)/../dist/vector-test-case.tar.gz .
+gen-test-case-bucket:
+	echo -n matrix= >> $$GITHUB_OUTPUT
+	amm .github/scripts/ci.sc genTestBuckets --testSrcDir ./tests --bucketSize $(RUNNERS) --outFile ./test-case-matrix.json
+	cat ./test-case-matrix.json >> $$GITHUB_OUTPUT
+
+build-test-cases:
+	rm -rf out tests/out
+	amm .github/scripts/ci.sc buildTestCases --testSrcDir ./tests --outDir $(OUT_DIR) --taskBucket $(TESTS)