Skip to content

Commit e05ecbe

Browse files
authored
GEODE-10442: Add acceptanceTest step to GHA pipeline (apache#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 system
1 parent faa6fe4 commit e05ecbe

File tree

4 files changed

+44
-4
lines changed

4 files changed

+44
-4
lines changed

.github/workflows/gradle.yml

+41-1
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,44 @@ jobs:
183183
with:
184184
name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }}
185185
path: build/reports
186-
retention-days: 5
186+
retention-days: 5
187+
188+
acceptanceTest:
189+
needs: [apiCheck, unitTest]
190+
strategy:
191+
matrix:
192+
os: [ubuntu-latest]
193+
distribution: ['liberica']
194+
java: ['8']
195+
runs-on: ${{ matrix.os }}
196+
steps:
197+
- uses: actions/checkout@v3
198+
- name: Set up JDK
199+
uses: actions/setup-java@v3
200+
with:
201+
distribution: ${{ matrix.distribution }}
202+
java-version: ${{ matrix.java }}
203+
- name: Setup Gradle
204+
uses: gradle/gradle-build-action@v2
205+
- name: Run acceptance tests
206+
run: |
207+
GRADLE_JVM_PATH=${JAVA_HOME_8_X64}
208+
JAVA_BUILD_PATH=${JAVA_HOME_8_X64}
209+
JAVA_BUILD_VERSION=8
210+
JAVA_TEST_VERSION=8
211+
cp gradlew gradlewStrict
212+
sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.back gradlewStrict
213+
GRADLE_JVM=${GRADLE_JVM_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict \
214+
--no-parallel \
215+
-PcompileJVM=${JAVA_BUILD_PATH} \
216+
-PcompileJVMVer=${JAVA_BUILD_VERSION} \
217+
-PtestJVM=${JAVA_TEST_PATH} \
218+
-PtestJVMVer=${JAVA_TEST_VERSION} \
219+
-PtestJava8Home=${JAVA_HOME_8_X64} \
220+
acceptanceTest --console=plain --no-daemon
221+
- uses: actions/upload-artifact@v3
222+
if: failure()
223+
with:
224+
name: acceptance-test-reports-${{ matrix.os }}-${{ matrix.java }}
225+
path: build/reports
226+
retention-days: 5

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class DependencyConstraints {
166166
api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.5.0')
167167
api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.4.0')
168168
api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springshell.version'))
169-
api(group: 'org.testcontainers', name: 'testcontainers', version: '1.15.3')
169+
api(group: 'org.testcontainers', name: 'testcontainers', version: '1.17.6')
170170
api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
171171
api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
172172
api(group: 'xml-apis', name: 'xml-apis', version: '1.4.01')

geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOpTest.java geode-core/src/integrationTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOpIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.geode.internal.cache.partitioned.rebalance.RebalanceDirector;
3131

3232

33-
public class PartitionedRegionRebalanceOpTest {
33+
public class PartitionedRegionRebalanceOpIntegrationTest {
3434
private PartitionedRegion leaderRegion;
3535
private PartitionedRegion colocRegion1;
3636
private PartitionedRegion colocRegion2;

geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java geode-core/src/integrationTest/java/org/apache/geode/internal/tcp/MsgStreamerIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.apache.geode.internal.net.BufferPool;
4242
import org.apache.geode.internal.serialization.KnownVersion;
4343

44-
public class MsgStreamerTest {
44+
public class MsgStreamerIntegrationTest {
4545
private final DMStats stats = mock(DMStats.class);
4646
private final BufferPool pool = spy(new BufferPool(stats));
4747
Connection connection1 = mock(Connection.class);

0 commit comments

Comments
 (0)