integration: simplify test splitting

Avoid the need to pass slice config with env variable.
Instead slice can be set directly in the --run filter.

Signed-off-by: Tonis Tiigi <[email protected]>

Author: tonistiigi

.github/workflows/test-os.yml

@@ -110,14 +110,13 @@ jobs:
         name: Prepare
         run: |
           TESTPKG=$(echo "${{ matrix.pkg }}" | awk '-F#' '{print $1}')
-          TESTSLICE=$(echo "${{ matrix.pkg }}" | awk '-F#' '{print $2}')
           echo "TESTPKG=$TESTPKG" >> $GITHUB_ENV
           echo "TEST_REPORT_NAME=${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.worker }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
           testFlags="${{ env.TESTFLAGS }}"
+          testSlice=$(echo "${{ matrix.pkg }}" | awk '-F#' '{print $2}')
           testSliceOffset=""
-          if [ -n "$TESTSLICE" ]; then
-            echo "TESTSLICE=$TESTSLICE" >> $GITHUB_ENV
-            testSliceOffset="slice=$TESTSLICE/"
+          if [ -n "$testSlice" ]; then
+            testSliceOffset="slice=$testSlice/"
           fi
           if [ -n "${{ matrix.worker }}" ]; then
             testFlags="${testFlags} --run=TestIntegration/$testSliceOffset.*/worker=${{ matrix.worker }}"

util/testutil/integration/run.go

@@ -164,21 +164,26 @@ func Run(t *testing.T, testCases []Test, opt ...TestOpt) {
 	}
 
 	var sliceSplit int
-	v, ok := os.LookupEnv("TESTSLICE")
-	if ok {
-		t.Logf("TESTSLICE=%s", v)
-		offsetS, totalS, ok := strings.Cut(v, "-")
-		if !ok {
-			t.Fatalf("invalid TESTSLICE=%s", v)
-		}
-		offset, err := strconv.Atoi(offsetS)
-		require.NoError(t, err)
-		total, err := strconv.Atoi(totalS)
-		require.NoError(t, err)
-		if offset < 1 || total < 1 || offset > total {
-			t.Fatalf("invalid TESTSLICE=%s", v)
+	if filter, ok := lookupTestFilter(); ok {
+		parts := strings.Split(filter, "/")
+		if len(parts) >= 2 {
+			const prefix = "slice="
+			if strings.HasPrefix(parts[1], prefix) {
+				conf := strings.TrimPrefix(parts[1], prefix)
+				offsetS, totalS, ok := strings.Cut(conf, "-")
+				if !ok {
+					t.Fatalf("invalid slice=%q", conf)
+				}
+				offset, err := strconv.Atoi(offsetS)
+				require.NoError(t, err)
+				total, err := strconv.Atoi(totalS)
+				require.NoError(t, err)
+				if offset < 1 || total < 1 || offset > total {
+					t.Fatalf("invalid slice=%q", conf)
+				}
+				sliceSplit = total
+			}
 		}
-		sliceSplit = total
 	}
 
 	var tc testConf
@@ -488,3 +493,13 @@ func UnixOrWindows[T any](unix, windows T) T {
 	}
 	return unix
 }
+
+func lookupTestFilter() (string, bool) {
+	const prefix = "-test.run="
+	for _, arg := range os.Args {
+		if strings.HasPrefix(arg, prefix) {
+			return strings.TrimPrefix(arg, prefix), true
+		}
+	}
+	return "", false
+}