Skip to content

Commit

Permalink
GEODE-10442: Add acceptanceTest step to GHA pipeline (apache#7876)
Browse files Browse the repository at this point in the history
    Upgraded testcontainers dependency to newer version as
    newer version fixed a requirement of needing 2GB disk
    available for docker.

    Moved MsgStreamerTest and PartitionRegionRebalanceOpTest
    into integration test suite as they are creating distribution
    system
  • Loading branch information
sboorlagadda authored Mar 30, 2023
1 parent faa6fe4 commit e05ecbe
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 4 deletions.
42 changes: 41 additions & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,44 @@ jobs:
with:
name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }}
path: build/reports
retention-days: 5
retention-days: 5

acceptanceTest:
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: ${{ matrix.java }}
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Run acceptance tests
run: |
GRADLE_JVM_PATH=${JAVA_HOME_8_X64}
JAVA_BUILD_PATH=${JAVA_HOME_8_X64}
JAVA_BUILD_VERSION=8
JAVA_TEST_VERSION=8
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 \
--no-parallel \
-PcompileJVM=${JAVA_BUILD_PATH} \
-PcompileJVMVer=${JAVA_BUILD_VERSION} \
-PtestJVM=${JAVA_TEST_PATH} \
-PtestJVMVer=${JAVA_TEST_VERSION} \
-PtestJava8Home=${JAVA_HOME_8_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
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class DependencyConstraints {
api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.5.0')
api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.4.0')
api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springshell.version'))
api(group: 'org.testcontainers', name: 'testcontainers', version: '1.15.3')
api(group: 'org.testcontainers', name: 'testcontainers', version: '1.17.6')
api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
api(group: 'xml-apis', name: 'xml-apis', version: '1.4.01')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.apache.geode.internal.cache.partitioned.rebalance.RebalanceDirector;


public class PartitionedRegionRebalanceOpTest {
public class PartitionedRegionRebalanceOpIntegrationTest {
private PartitionedRegion leaderRegion;
private PartitionedRegion colocRegion1;
private PartitionedRegion colocRegion2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.apache.geode.internal.net.BufferPool;
import org.apache.geode.internal.serialization.KnownVersion;

public class MsgStreamerTest {
public class MsgStreamerIntegrationTest {
private final DMStats stats = mock(DMStats.class);
private final BufferPool pool = spy(new BufferPool(stats));
Connection connection1 = mock(Connection.class);
Expand Down

0 comments on commit e05ecbe

Please sign in to comment.