From 5949c41b1dc981bb46c50090c34a9a17bc2a1bc4 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Thu, 30 Mar 2023 04:31:41 -0700 Subject: [PATCH 1/9] Added windows tests to gha pipeline --- .github/workflows/gradle.yml | 514 +++++++++++++++++++++++++---------- 1 file changed, 364 insertions(+), 150 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2a931cbc8c2..1771913c8c2 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -30,162 +30,216 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'liberica' - - name: Run 'build install javadoc spotlessCheck rat checkPom resolveDependencies pmdMain' with Gradle - uses: gradle/gradle-build-action@v2 - with: - arguments: --console=plain --no-daemon build install javadoc spotlessCheck rat checkPom resolveDependencies pmdMain -x test + - uses: actions/checkout@v3 + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'liberica' + - name: Run 'build install javadoc spotlessCheck rat checkPom resolveDependencies pmdMain' with Gradle + uses: gradle/gradle-build-action@v2 + with: + arguments: --console=plain --no-daemon build install javadoc spotlessCheck rat checkPom resolveDependencies pmdMain -x test apiCheck: - needs: build - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - distribution: [ 'liberica' ] - java: ['11'] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK (include all 3 JDKs in the env) - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.distribution }} - java-version: | - 8 - 11 - 17 - - name: Set JAVA_TEST_PATH to 11 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV - if: matrix.java == '11' - - name: Java API Check - run: | - GRADLE_JVM_PATH=${JAVA_HOME_8_X64} - JAVA_BUILD_PATH=${JAVA_HOME_8_X64} - JAVA_BUILD_VERSION=8 # Use jdk 8 for build - JAVA_TEST_VERSION=${{ matrix.java }} - cp gradlew gradlewStrict - sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict - GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \ - -PcompileJVM=${JAVA_BUILD_PATH} \ - -PcompileJVMVer=${JAVA_BUILD_VERSION} \ - -PtestJVM=${JAVA_TEST_PATH} \ - -PtestJVMVer=${JAVA_TEST_VERSION} \ - -PtestJava8Home=${JAVA_HOME_8_X64} \ - -PtestJava11Home=${JAVA_HOME_11_X64} \ - -PtestJava17Home=${JAVA_HOME_17_X64} \ - japicmp --console=plain --no-daemon + needs: build + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + distribution: [ 'liberica' ] + java: ['11'] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up JDK (include all 3 JDKs in the env) + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: | + 8 + 11 + 17 + - name: Set JAVA_TEST_PATH to 11 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV + if: matrix.java == '11' + - name: Java API Check + run: | + GRADLE_JVM_PATH=${JAVA_HOME_8_X64} + JAVA_BUILD_PATH=${JAVA_HOME_8_X64} + JAVA_BUILD_VERSION=8 # Use jdk 8 for build + JAVA_TEST_VERSION=${{ matrix.java }} + cp gradlew gradlewStrict + sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict + GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \ + -PcompileJVM=${JAVA_BUILD_PATH} \ + -PcompileJVMVer=${JAVA_BUILD_VERSION} \ + -PtestJVM=${JAVA_TEST_PATH} \ + -PtestJVMVer=${JAVA_TEST_VERSION} \ + -PtestJava8Home=${JAVA_HOME_8_X64} \ + -PtestJava11Home=${JAVA_HOME_11_X64} \ + -PtestJava17Home=${JAVA_HOME_17_X64} \ + japicmp --console=plain --no-daemon unitTest: - needs: build - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - distribution: ['liberica'] - java: ['8', '11', '17'] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.distribution }} - java-version: | - 8 - 11 - 17 - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - name: Set JAVA_TEST_PATH to 8 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV - if: matrix.java == '8' - - name: Set JAVA_TEST_PATH to 11 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV - if: matrix.java == '11' - - name: Set JAVA_TEST_PATH to 17 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV - if: matrix.java == '17' - - name: Run unit tests - run: | - GRADLE_JVM_PATH=${JAVA_HOME_8_X64} - JAVA_BUILD_PATH=${JAVA_HOME_8_X64} - JAVA_BUILD_VERSION=8 # Use jdk 8 for build - JAVA_TEST_VERSION=${{ matrix.java }} - cp gradlew gradlewStrict - sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict - GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \ - --parallel \ - -PcompileJVM=${JAVA_BUILD_PATH} \ - -PcompileJVMVer=${JAVA_BUILD_VERSION} \ - -PtestJVM=${JAVA_TEST_PATH} \ - -PtestJVMVer=${JAVA_TEST_VERSION} \ - -PtestJava8Home=${JAVA_HOME_8_X64} \ - -PtestJava11Home=${JAVA_HOME_11_X64} \ - -PtestJava17Home=${JAVA_HOME_17_X64} \ - test --console=plain --no-daemon - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }} - path: build/reports - retention-days: 5 + needs: build + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + distribution: ['liberica'] + java: ['8', '11', '17'] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up JDK (include all 3 JDKs in env) + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: | + 8 + 11 + 17 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' + - name: Set JAVA_TEST_PATH to 11 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV + if: matrix.java == '11' + - name: Set JAVA_TEST_PATH to 17 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV + if: matrix.java == '17' + - name: Run unit tests + run: | + GRADLE_JVM_PATH=${JAVA_HOME_8_X64} + JAVA_BUILD_PATH=${JAVA_HOME_8_X64} + JAVA_BUILD_VERSION=8 # Use jdk 8 for build + JAVA_TEST_VERSION=${{ matrix.java }} + cp gradlew gradlewStrict + sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict + GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \ + --parallel \ + -PcompileJVM=${JAVA_BUILD_PATH} \ + -PcompileJVMVer=${JAVA_BUILD_VERSION} \ + -PtestJVM=${JAVA_TEST_PATH} \ + -PtestJVMVer=${JAVA_TEST_VERSION} \ + -PtestJava8Home=${JAVA_HOME_8_X64} \ + -PtestJava11Home=${JAVA_HOME_11_X64} \ + -PtestJava17Home=${JAVA_HOME_17_X64} \ + test --console=plain --no-daemon + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }} + path: build/reports + retention-days: 5 + + windowsUnitTest: + needs: build + strategy: + fail-fast: false + matrix: + os: [windows-latest] + distribution: ['liberica'] + java: ['8', '11', '17'] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up JDK (include all 3 JDKs in env) + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: | + 8 + 11 + 17 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' + - name: Set JAVA_TEST_PATH to 11 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV + if: matrix.java == '11' + - name: Set JAVA_TEST_PATH to 17 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV + if: matrix.java == '17' + - name: Run unit tests + run: | + $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build + $env:JAVA_TEST_VERSION=${{ matrix.java }} + $env:GRADLE_JVM=$env:GRADLE_JVM_PATH + $env:JAVA_TEST_PATH=$env:JAVA_TEST_PATH + gradle -PcompileJVM=$env:JAVA_BUILD_PATH \ + -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ + -PtestJVM=$env:JAVA_TEST_PATH \ + -PtestJVMVer=$env:JAVA_TEST_VERSION \ + -PtestJava8Home=$env:JAVA_HOME_8_X64 \ + -PtestJava11Home=$env:JAVA_HOME_11_X64 \ + -PtestJava17Home=$env:JAVA_HOME_17_X64 \ + test --console=plain --no-daemon integrationTest: - needs: [apiCheck, unitTest] - strategy: - matrix: - os: [ubuntu-latest] - distribution: ['liberica'] - java: ['8'] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.distribution }} - java-version: | - 8 - 11 - 17 - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - name: Run integration tests - run: | - GRADLE_JVM_PATH=${JAVA_HOME_8_X64} - JAVA_BUILD_PATH=${JAVA_HOME_8_X64} - JAVA_BUILD_VERSION=8 - JAVA_TEST_VERSION=${{ matrix.java }} - cp gradlew gradlewStrict - sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict - GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \ - --parallel \ - -PparallelDunit \ - --max-workers=12 \ - -PcompileJVM=${JAVA_BUILD_PATH} \ - -PcompileJVMVer=${JAVA_BUILD_VERSION} \ - -PtestJVM=${JAVA_TEST_PATH} \ - -PtestJVMVer=${JAVA_TEST_VERSION} \ - -PtestJava8Home=${JAVA_HOME_8_X64} \ - -PtestJava11Home=${JAVA_HOME_11_X64} \ - -PtestJava17Home=${JAVA_HOME_17_X64} \ - integrationTest --console=plain --no-daemon - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }} - path: build/reports - retention-days: 5 + needs: [apiCheck, unitTest] + strategy: + matrix: + os: [ubuntu-latest] + distribution: ['liberica'] + java: ['8'] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: | + 8 + 11 + 17 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' + - name: Run integration tests + run: | + GRADLE_JVM_PATH=${JAVA_HOME_8_X64} + JAVA_BUILD_PATH=${JAVA_HOME_8_X64} + JAVA_BUILD_VERSION=8 + JAVA_TEST_VERSION=${{ matrix.java }} + cp gradlew gradlewStrict + sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict + GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \ + --parallel \ + -PparallelDunit \ + --max-workers=12 \ + -PcompileJVM=${JAVA_BUILD_PATH} \ + -PcompileJVMVer=${JAVA_BUILD_VERSION} \ + -PtestJVM=${JAVA_TEST_PATH} \ + -PtestJVMVer=${JAVA_TEST_VERSION} \ + -PtestJava8Home=${JAVA_HOME_8_X64} \ + -PtestJava11Home=${JAVA_HOME_11_X64} \ + -PtestJava17Home=${JAVA_HOME_17_X64} \ + integrationTest --console=plain --no-daemon + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }} + path: build/reports + retention-days: 5 acceptanceTest: needs: [apiCheck, unitTest] @@ -204,6 +258,10 @@ jobs: java-version: ${{ matrix.java }} - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' - name: Run acceptance tests run: | GRADLE_JVM_PATH=${JAVA_HOME_8_X64} @@ -244,6 +302,10 @@ jobs: java-version: ${{ matrix.java }} - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' - name: Run wan distributed tests run: | GRADLE_JVM_PATH=${JAVA_HOME_8_X64} @@ -286,6 +348,10 @@ jobs: java-version: ${{ matrix.java }} - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' - name: Run cq distributed tests run: | GRADLE_JVM_PATH=${JAVA_HOME_8_X64} @@ -328,6 +394,10 @@ jobs: java-version: ${{ matrix.java }} - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' - name: Run lucene distributed tests run: | GRADLE_JVM_PATH=${JAVA_HOME_8_X64} @@ -370,6 +440,10 @@ jobs: java-version: ${{ matrix.java }} - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' - name: Run gfsh, web-mgmt, web distributed tests run: | GRADLE_JVM_PATH=${JAVA_HOME_8_X64} @@ -414,6 +488,10 @@ jobs: java-version: ${{ matrix.java }} - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' - name: Run assembly, connectors, old-client, extensions distributed tests run: | GRADLE_JVM_PATH=${JAVA_HOME_8_X64} @@ -442,3 +520,139 @@ jobs: name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} path: build/reports retention-days: 5 + + windowsIntegrationTest: + needs: [apiCheck, unitTest] + strategy: + matrix: + os: [windows-latest] + distribution: ['liberica'] + java: ['8'] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: | + 8 + 11 + 17 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 + if: matrix.java == '8' + - name: Run integration tests + run: | + $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build + $env:JAVA_TEST_VERSION=${{ matrix.java }} + $env:GRADLE_JVM=$env:GRADLE_JVM_PATH + gradle -PcompileJVM=$env:JAVA_BUILD_PATH \ + -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ + -PtestJVM=$env:JAVA_TEST_PATH \ + -PtestJVMVer=$env:JAVA_TEST_VERSION \ + -PtestJava8Home=$env:JAVA_HOME_8_X64 \ + -PtestJava11Home=$env:JAVA_HOME_11_X64 \ + -PtestJava17Home=$env:JAVA_HOME_17_X64 \ + integrationTest --console=plain --no-daemon + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }} + path: build/reports + retention-days: 5 + + windowsAcceptanceTest: + needs: [apiCheck, unitTest] + strategy: + matrix: + os: [windows-latest] + distribution: ['liberica'] + java: ['8'] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java }} + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 + if: matrix.java == '8' + - name: Run acceptance tests + run: | + $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build + $env:JAVA_TEST_VERSION=${{ matrix.java }} + $env:GRADLE_JVM=$env:GRADLE_JVM_PATH + gradle -PcompileJVM=$env:JAVA_BUILD_PATH \ + -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ + -PtestJVM=$env:JAVA_TEST_PATH \ + -PtestJVMVer=$env:JAVA_TEST_VERSION \ + -PtestJava8Home=$env:JAVA_HOME_8_X64 \ + -PtestJava11Home=$env:JAVA_HOME_11_X64 \ + -PtestJava17Home=$env:JAVA_HOME_17_X64 \ + acceptanceTest --console=plain --no-daemon + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: acceptance-test-reports-${{ matrix.os }}-${{ matrix.java }} + path: build/reports + retention-days: 5 + + windowsGfshDistributedTest: + needs: [apiCheck, unitTest] + strategy: + matrix: + os: [windows-latest] + distribution: ['liberica'] + java: ['8'] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: | + 8 + 11 + 17 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 + if: matrix.java == '8' + - name: Run integration tests + run: | + $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build + $env:JAVA_TEST_VERSION=$env:JAVA_HOME_8_X64 + $env:GRADLE_JVM=$env:GRADLE_JVM_PATH + gradle -PcompileJVM=$env:JAVA_BUILD_PATH \ + -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ + -PtestJVM=$env:JAVA_TEST_PATH \ + -PtestJVMVer=$env:JAVA_TEST_VERSION \ + -PtestJava8Home=$env:JAVA_HOME_8_X64 \ + -PtestJava11Home=$env:JAVA_HOME_11_X64 \ + -PtestJava17Home=$env:JAVA_HOME_17_X64 \ + distributedTest -PtestCategory=org.apache.geode.test.junit.categories.GfshTest \ + --console=plain --no-daemon + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: windows-gfsh-test-reports-${{ matrix.os }}-${{ matrix.java }} + path: build/reports + retention-days: 5 \ No newline at end of file From efed5528b496eef717231836c66d147050e50fbb Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Thu, 30 Mar 2023 04:33:35 -0700 Subject: [PATCH 2/9] fix typo --- .github/workflows/gradle.yml | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1771913c8c2..0eb3c96ac9b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -140,6 +140,7 @@ jobs: path: build/reports retention-days: 5 +<<<<<<< HEAD windowsUnitTest: needs: build strategy: @@ -520,6 +521,64 @@ jobs: name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} path: build/reports retention-days: 5 +======= + unitTest: + needs: build + strategy: + fail-fast: false + matrix: + os: [windows-latest] + distribution: ['liberica'] + java: ['8', '11', '17'] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Set up JDK (include all 3 JDKs in env) + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: | + 8 + 11 + 17 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Set JAVA_TEST_PATH to 8 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + if: matrix.java == '8' + - name: Set JAVA_TEST_PATH to 11 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV + if: matrix.java == '11' + - name: Set JAVA_TEST_PATH to 17 + run: | + echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV + if: matrix.java == '17' + - name: Run unit tests + run: | + GRADLE_JVM_PATH=${JAVA_HOME_8_X64} + JAVA_BUILD_PATH=${JAVA_HOME_8_X64} + JAVA_BUILD_VERSION=11 # Use jdk 11 for build + JAVA_TEST_VERSION=${{ matrix.java }} + cp gradlew gradlewStrict + sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict + GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \ + -PcompileJVM=${JAVA_BUILD_PATH} \ + -PcompileJVMVer=${JAVA_BUILD_VERSION} \ + -PtestJVM=${JAVA_TEST_PATH} \ + -PtestJVMVer=${JAVA_TEST_VERSION} \ + -PtestJava8Home=${JAVA_HOME_8_X64} \ + -PtestJava11Home=${JAVA_HOME_11_X64} \ + -PtestJava17Home=${JAVA_HOME_17_X64} \ + test --console=plain --no-daemon + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }} + path: build/reports + retention-days: 5 +>>>>>>> 54fc01fa63 (fix typo) windowsIntegrationTest: needs: [apiCheck, unitTest] From c6806201536b34e3d391ea67e9d45a2c58b05eb3 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Thu, 30 Mar 2023 05:03:04 -0700 Subject: [PATCH 3/9] set env --- .github/workflows/gradle.yml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0eb3c96ac9b..c9d577d2823 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -557,21 +557,12 @@ jobs: if: matrix.java == '17' - name: Run unit tests run: | - GRADLE_JVM_PATH=${JAVA_HOME_8_X64} - JAVA_BUILD_PATH=${JAVA_HOME_8_X64} - JAVA_BUILD_VERSION=11 # Use jdk 11 for build - JAVA_TEST_VERSION=${{ matrix.java }} - cp gradlew gradlewStrict - sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict - GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \ - -PcompileJVM=${JAVA_BUILD_PATH} \ - -PcompileJVMVer=${JAVA_BUILD_VERSION} \ - -PtestJVM=${JAVA_TEST_PATH} \ - -PtestJVMVer=${JAVA_TEST_VERSION} \ - -PtestJava8Home=${JAVA_HOME_8_X64} \ - -PtestJava11Home=${JAVA_HOME_11_X64} \ - -PtestJava17Home=${JAVA_HOME_17_X64} \ - test --console=plain --no-daemon + dir env: + $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 + $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build + $env:JAVA_TEST_VERSION=${{ matrix.java }} + dir env: - uses: actions/upload-artifact@v3 if: failure() with: From cf98887e5c3bb689e38cdd9052adadccfaee2f83 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Thu, 30 Mar 2023 18:06:10 -0700 Subject: [PATCH 4/9] try now --- .github/workflows/gradle.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c9d577d2823..9b862788215 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -557,12 +557,19 @@ jobs: if: matrix.java == '17' - name: Run unit tests run: | - dir env: $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build $env:JAVA_TEST_VERSION=${{ matrix.java }} - dir env: + GRADLE_JVM=$env:GRADLE_JVM_PATH JAVA_TEST_PATH=$env:JAVA_TEST_PATH gradlew.bat \ + -PcompileJVM=$env:JAVA_BUILD_PATH \ + -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ + -PtestJVM=$env:JAVA_TEST_PATH \ + -PtestJVMVer=$env:JAVA_TEST_VERSION \ + -PtestJava8Home=$env:JAVA_HOME_8_X64 \ + -PtestJava11Home=$env:JAVA_HOME_11_X64 \ + -PtestJava17Home=$env:JAVA_HOME_17_X64 \ + test --console=plain --no-daemon - uses: actions/upload-artifact@v3 if: failure() with: From e9560c7c3bd224220cfdfe9bdba67f3794d4df35 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Mon, 17 Apr 2023 20:45:18 -0700 Subject: [PATCH 5/9] rebase from develop --- .github/workflows/gradle.yml | 57 ------------------------------------ 1 file changed, 57 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9b862788215..1771913c8c2 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -140,7 +140,6 @@ jobs: path: build/reports retention-days: 5 -<<<<<<< HEAD windowsUnitTest: needs: build strategy: @@ -521,62 +520,6 @@ jobs: name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} path: build/reports retention-days: 5 -======= - unitTest: - needs: build - strategy: - fail-fast: false - matrix: - os: [windows-latest] - distribution: ['liberica'] - java: ['8', '11', '17'] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.distribution }} - java-version: | - 8 - 11 - 17 - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - name: Set JAVA_TEST_PATH to 8 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV - if: matrix.java == '8' - - name: Set JAVA_TEST_PATH to 11 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV - if: matrix.java == '11' - - name: Set JAVA_TEST_PATH to 17 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV - if: matrix.java == '17' - - name: Run unit tests - run: | - $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build - $env:JAVA_TEST_VERSION=${{ matrix.java }} - GRADLE_JVM=$env:GRADLE_JVM_PATH JAVA_TEST_PATH=$env:JAVA_TEST_PATH gradlew.bat \ - -PcompileJVM=$env:JAVA_BUILD_PATH \ - -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ - -PtestJVM=$env:JAVA_TEST_PATH \ - -PtestJVMVer=$env:JAVA_TEST_VERSION \ - -PtestJava8Home=$env:JAVA_HOME_8_X64 \ - -PtestJava11Home=$env:JAVA_HOME_11_X64 \ - -PtestJava17Home=$env:JAVA_HOME_17_X64 \ - test --console=plain --no-daemon - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }} - path: build/reports - retention-days: 5 ->>>>>>> 54fc01fa63 (fix typo) windowsIntegrationTest: needs: [apiCheck, unitTest] From 882c0e94940bd28714252b5d807c7390f7295f10 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Tue, 18 Apr 2023 07:44:34 -0700 Subject: [PATCH 6/9] try just gradle task --- .github/workflows/gradle.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1771913c8c2..a80a93a5bbf 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -181,14 +181,7 @@ jobs: $env:JAVA_TEST_VERSION=${{ matrix.java }} $env:GRADLE_JVM=$env:GRADLE_JVM_PATH $env:JAVA_TEST_PATH=$env:JAVA_TEST_PATH - gradle -PcompileJVM=$env:JAVA_BUILD_PATH \ - -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ - -PtestJVM=$env:JAVA_TEST_PATH \ - -PtestJVMVer=$env:JAVA_TEST_VERSION \ - -PtestJava8Home=$env:JAVA_HOME_8_X64 \ - -PtestJava11Home=$env:JAVA_HOME_11_X64 \ - -PtestJava17Home=$env:JAVA_HOME_17_X64 \ - test --console=plain --no-daemon + gradle test --console=plain --no-daemon integrationTest: needs: [apiCheck, unitTest] From 80b3d590cf41a6e52d15b1974cc2dc4a95b42314 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Thu, 11 May 2023 17:53:50 -0700 Subject: [PATCH 7/9] fix unit failure --- .github/workflows/gradle.yml | 143 ++--------------------------------- 1 file changed, 5 insertions(+), 138 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a80a93a5bbf..262ffa09e77 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -173,7 +173,7 @@ jobs: run: | echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV if: matrix.java == '17' - - name: Run unit tests + - name: Set ENV vars run: | $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 @@ -181,7 +181,10 @@ jobs: $env:JAVA_TEST_VERSION=${{ matrix.java }} $env:GRADLE_JVM=$env:GRADLE_JVM_PATH $env:JAVA_TEST_PATH=$env:JAVA_TEST_PATH - gradle test --console=plain --no-daemon + - name: Run unit tests + uses: gradle/gradle-build-action@v2 + with: + arguments: test --console=plain --no-daemon integrationTest: needs: [apiCheck, unitTest] @@ -512,140 +515,4 @@ jobs: with: name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} path: build/reports - retention-days: 5 - - windowsIntegrationTest: - needs: [apiCheck, unitTest] - strategy: - matrix: - os: [windows-latest] - distribution: ['liberica'] - java: ['8'] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.distribution }} - java-version: | - 8 - 11 - 17 - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - name: Set JAVA_TEST_PATH to 8 - run: | - $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 - if: matrix.java == '8' - - name: Run integration tests - run: | - $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build - $env:JAVA_TEST_VERSION=${{ matrix.java }} - $env:GRADLE_JVM=$env:GRADLE_JVM_PATH - gradle -PcompileJVM=$env:JAVA_BUILD_PATH \ - -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ - -PtestJVM=$env:JAVA_TEST_PATH \ - -PtestJVMVer=$env:JAVA_TEST_VERSION \ - -PtestJava8Home=$env:JAVA_HOME_8_X64 \ - -PtestJava11Home=$env:JAVA_HOME_11_X64 \ - -PtestJava17Home=$env:JAVA_HOME_17_X64 \ - integrationTest --console=plain --no-daemon - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }} - path: build/reports - retention-days: 5 - - windowsAcceptanceTest: - needs: [apiCheck, unitTest] - strategy: - matrix: - os: [windows-latest] - distribution: ['liberica'] - java: ['8'] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.distribution }} - java-version: ${{ matrix.java }} - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - name: Set JAVA_TEST_PATH to 8 - run: | - $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 - if: matrix.java == '8' - - name: Run acceptance tests - run: | - $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build - $env:JAVA_TEST_VERSION=${{ matrix.java }} - $env:GRADLE_JVM=$env:GRADLE_JVM_PATH - gradle -PcompileJVM=$env:JAVA_BUILD_PATH \ - -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ - -PtestJVM=$env:JAVA_TEST_PATH \ - -PtestJVMVer=$env:JAVA_TEST_VERSION \ - -PtestJava8Home=$env:JAVA_HOME_8_X64 \ - -PtestJava11Home=$env:JAVA_HOME_11_X64 \ - -PtestJava17Home=$env:JAVA_HOME_17_X64 \ - acceptanceTest --console=plain --no-daemon - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: acceptance-test-reports-${{ matrix.os }}-${{ matrix.java }} - path: build/reports - retention-days: 5 - - windowsGfshDistributedTest: - needs: [apiCheck, unitTest] - strategy: - matrix: - os: [windows-latest] - distribution: ['liberica'] - java: ['8'] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.distribution }} - java-version: | - 8 - 11 - 17 - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - name: Set JAVA_TEST_PATH to 8 - run: | - $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 - if: matrix.java == '8' - - name: Run integration tests - run: | - $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build - $env:JAVA_TEST_VERSION=$env:JAVA_HOME_8_X64 - $env:GRADLE_JVM=$env:GRADLE_JVM_PATH - gradle -PcompileJVM=$env:JAVA_BUILD_PATH \ - -PcompileJVMVer=$env:JAVA_BUILD_VERSION \ - -PtestJVM=$env:JAVA_TEST_PATH \ - -PtestJVMVer=$env:JAVA_TEST_VERSION \ - -PtestJava8Home=$env:JAVA_HOME_8_X64 \ - -PtestJava11Home=$env:JAVA_HOME_11_X64 \ - -PtestJava17Home=$env:JAVA_HOME_17_X64 \ - distributedTest -PtestCategory=org.apache.geode.test.junit.categories.GfshTest \ - --console=plain --no-daemon - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: windows-gfsh-test-reports-${{ matrix.os }}-${{ matrix.java }} - path: build/reports retention-days: 5 \ No newline at end of file From fc4c937bb2b3f331d515b9305bc58d546e1dda89 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Fri, 12 May 2023 06:41:32 -0700 Subject: [PATCH 8/9] simplify windows unit tests --- .github/workflows/gradle.yml | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 262ffa09e77..83f899223a0 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -147,7 +147,7 @@ jobs: matrix: os: [windows-latest] distribution: ['liberica'] - java: ['8', '11', '17'] + java: ['8'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -155,32 +155,9 @@ jobs: uses: actions/setup-java@v3 with: distribution: ${{ matrix.distribution }} - java-version: | - 8 - 11 - 17 + java-version: 8 - name: Setup Gradle uses: gradle/gradle-build-action@v2 - - name: Set JAVA_TEST_PATH to 8 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_8_X64}" >> $GITHUB_ENV - if: matrix.java == '8' - - name: Set JAVA_TEST_PATH to 11 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_11_X64}" >> $GITHUB_ENV - if: matrix.java == '11' - - name: Set JAVA_TEST_PATH to 17 - run: | - echo "JAVA_TEST_PATH=${JAVA_HOME_17_X64}" >> $GITHUB_ENV - if: matrix.java == '17' - - name: Set ENV vars - run: | - $env:GRADLE_JVM_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_PATH=$env:JAVA_HOME_8_X64 - $env:JAVA_BUILD_VERSION=11 # Use jdk 11 for build - $env:JAVA_TEST_VERSION=${{ matrix.java }} - $env:GRADLE_JVM=$env:GRADLE_JVM_PATH - $env:JAVA_TEST_PATH=$env:JAVA_TEST_PATH - name: Run unit tests uses: gradle/gradle-build-action@v2 with: From ca56a4155de738996f36298c33f6306811a64952 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Fri, 12 May 2023 07:29:20 -0700 Subject: [PATCH 9/9] retain logs --- .github/workflows/gradle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 83f899223a0..753cc5e0d24 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -162,6 +162,12 @@ jobs: uses: gradle/gradle-build-action@v2 with: arguments: test --console=plain --no-daemon + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: windows-unit-test-reports-${{ matrix.os }}-${{ matrix.java }} + path: build/reports + retention-days: 5 integrationTest: needs: [apiCheck, unitTest]