GEODE-10442: Add acceptanceTest step to GHA pipeline (#7876)
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
systemdiff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 90594bf..fc48669 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -183,4 +183,44 @@
with:
name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }}
path: build/reports
- retention-days: 5
\ No newline at end of file
+ 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
\ No newline at end of file
diff --git a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 649d6dc..46024ee 100644
--- a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -166,7 +166,7 @@
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')
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOpTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOpIntegrationTest.java
similarity index 97%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOpTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOpIntegrationTest.java
index 92f106a..58336f4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOpTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOpIntegrationTest.java
@@ -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;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/tcp/MsgStreamerIntegrationTest.java
similarity index 98%
rename from geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/tcp/MsgStreamerIntegrationTest.java
index b041f02..13084f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/tcp/MsgStreamerIntegrationTest.java
@@ -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);
