Merge pull request #16359 from jmhbnz/streamline-test-commands

Streamline test commands between branches
etcd-io · Aug 3, 2023 · cca2003 · cca2003
2 parents 2b533b4 + 7a33184
commit cca2003
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/.github/workflows/e2e-arm64-nightly.yaml b/.github/workflows/e2e-arm64-nightly.yaml
@@ -11,9 +11,7 @@ jobs:
     uses: ./.github/workflows/e2e-arm64-template.yaml
     with:
       etcdBranch: main
-      e2eTestCmd: make test-e2e-release
   release-35-arm64:
     uses: ./.github/workflows/e2e-arm64-template.yaml
     with:
       etcdBranch: release-3.5
-      e2eTestCmd: PASSES='build release e2e' COVER='false' ./test.sh
diff --git a/.github/workflows/e2e-arm64-template.yaml b/.github/workflows/e2e-arm64-template.yaml
@@ -6,9 +6,6 @@ on:
       etcdBranch:
         required: true
         type: string
-      e2eTestCmd:
-        required: false
-        type: string
 permissions: read-all
 jobs:
   test:
@@ -44,7 +41,7 @@ jobs:
           echo "${TARGET}"
           case "${TARGET}" in
             linux-arm64-e2e)
-              GOOS=linux GOARCH=arm64 CPU=4 EXPECT_DEBUG=true ${{ inputs.e2eTestCmd }}
+              GOOS=linux GOARCH=arm64 CPU=4 EXPECT_DEBUG=true make test-e2e-release
               ;;
             *)
               echo "Failed to find target"

diff --git a/.github/workflows/tests-arm64-nightly.yaml b/.github/workflows/tests-arm64-nightly.yaml
@@ -11,12 +11,8 @@ jobs:
     uses: ./.github/workflows/tests-arm64-template.yaml
     with:
       etcdBranch: main
-      integrationTestCmd: make test-integration
-      unitTestCmd: GO_TEST_FLAGS='-p=2' make test-unit
   release-35-arm64:
     uses: ./.github/workflows/tests-arm64-template.yaml
     with:
       etcdBranch: release-3.5
-      integrationTestCmd: PASSES='integration' ./test.sh
-      unitTestCmd: PASSES='unit' CPU='4' ./test.sh -p=2
       gofailMake: "no"
diff --git a/.github/workflows/tests-arm64-template.yaml b/.github/workflows/tests-arm64-template.yaml
@@ -6,12 +6,6 @@ on:
       etcdBranch:
         required: true
         type: string
-      integrationTestCmd:
-        required: true
-        type: string
-      unitTestCmd:
-        required: true
-        type: string
       gofailMake:
         required: false
         type: string
@@ -57,18 +51,18 @@ jobs:
           case "${TARGET}" in
             linux-arm64-integration-1-cpu)
               if [ "${{ inputs.gofailMake }}" == "yes" ]; then make gofail-enable; fi
-              GOOS=linux GOARCH=arm64 CPU=1 ${{ inputs.integrationTestCmd }}
+              GOOS=linux GOARCH=arm64 CPU=1 make test-integration
               ;;
             linux-arm64-integration-2-cpu)
               if [ "${{ inputs.gofailMake }}" == "yes" ]; then make gofail-enable; fi
-              GOOS=linux GOARCH=arm64 CPU=2 ${{ inputs.integrationTestCmd }}
+              GOOS=linux GOARCH=arm64 CPU=2 make test-integration
               ;;
             linux-arm64-integration-4-cpu)
               if [ "${{ inputs.gofailMake }}" == "yes" ]; then make gofail-enable; fi
-              GOOS=linux GOARCH=arm64 CPU=4 ${{ inputs.integrationTestCmd }}
+              GOOS=linux GOARCH=arm64 CPU=4 make test-integration
               ;;
             linux-arm64-unit-4-cpu)
-              GOOS=linux GOARCH=arm64 CPU=4 ${{ inputs.unitTestCmd }}
+              GOOS=linux GOARCH=arm64 CPU=4 GO_TEST_FLAGS='-p=2' make test-unit
               ;;
             *)
               echo "Failed to find target"