e2e-test-setup

apache · Oct 27, 2023 · 94bef5e · 94bef5e
1 parent 12c5f06
commit 94bef5e
Showing 1 changed file with 3 additions and 94 deletions.
diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml
@@ -224,105 +224,14 @@ jobs:
           name: docker-images-${{ matrix.java-version }}
           path: docker-images-skywalking-*.tar
 
-  unit-test:
-    if: |
-      ( always() && ! cancelled() ) &&
-      ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
-    name: Unit test
-    needs: [sanity-check, changes]
-    runs-on: ${{ matrix.os }}-latest
-    timeout-minutes: 30
-    strategy:
-      matrix:
-        os: [ubuntu, macos, windows]
-        java-version: [11]
-        include:
-          - os: ubuntu
-            java-version: 17
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - name: Cache maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.java-version }}
-          distribution: temurin
-      - name: Unit test
-        run: ./mvnw clean test -q -B -D"checkstyle.skip" || ./mvnw clean test -q -B -D"checkstyle.skip"
 
-  integration-test:
-    if: |
-      ( always() && ! cancelled() ) &&
-      ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
-    name: Integration test
-    needs: [sanity-check, changes]
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        java-version: [11, 17]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - name: Cache maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.java-version }}
-          distribution: temurin
-      - name: Integration test
-        run: |
-          # Exclude slow integration tests and run those tests separately below.
-          ./mvnw -B clean integration-test -Dcheckstyle.skip -DskipUTs=true -DexcludedGroups=slow || \
-          ./mvnw -B clean integration-test -Dcheckstyle.skip -DskipUTs=true -DexcludedGroups=slow
-
-  # Slow tests
-  slow-integration-test:
+  e2e-test-setup:
     if: |
       ( always() && ! cancelled() ) &&
       ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
-    name: Slow Integration Tests
-    needs: [sanity-check, changes]
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        test:
-          - name: ElasticSearch / OpenSearch
-            class: org.apache.skywalking.library.elasticsearch.ElasticSearchIT
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-      - name: Cache maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 11
-          distribution: temurin
-      - name: ${{ matrix.test.name }}
-        run: |
-          ./mvnw -B clean integration-test -Dcheckstyle.skip -DskipUTs=true -Dit.test=${{ matrix.test.class }} -Dfailsafe.failIfNoSpecifiedTests=false || \
-          ./mvnw -B clean integration-test -Dcheckstyle.skip -DskipUTs=true -Dit.test=${{ matrix.test.class }} -Dfailsafe.failIfNoSpecifiedTests=false
-  e2e-test-setup:
+    needs: [ docker ]
+    runs-on: ${{ matrix.test.runs-on || 'ubuntu-latest' }}
     name: E2E test setup
-    needs: [docker]
-    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3