[geode] branch develop updated: GEODE-5387: Adding job to the pr pipeline to stress new tests
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 78c178d GEODE-5387: Adding job to the pr pipeline to stress new tests
78c178d is described below
commit 78c178d97c5b2b3507ace84ed7676f6e28b37ae9
Author: Dan Smith
AuthorDate: Tue Aug 14 15:31:00 2018 -0700
GEODE-5387: Adding job to the pr pipeline to stress new tests
Adding a job to the PR pipeline that finds new or modified test files
and runs them many times. The goal is to fail PRs that create new flaky
tests.
---
ci/pipelines/pull-request/base.yml| 1 +
ci/pipelines/pull-request/deploy_pr_pipeline.sh | 12 +
ci/pipelines/pull-request/pr-template.yml | 2 +-
ci/pipelines/pull-request/test-stubs/newtests.yml | 33
ci/scripts/archive_results.sh | 2 +-
ci/scripts/repeat-new-tests.sh| 64 +++
gradle/test.gradle| 4 ++
7 files changed, 116 insertions(+), 2 deletions(-)
diff --git a/ci/pipelines/pull-request/base.yml
b/ci/pipelines/pull-request/base.yml
index ae65c57..a6e5d88 100644
--- a/ci/pipelines/pull-request/base.yml
+++ b/ci/pipelines/pull-request/base.yml
@@ -71,6 +71,7 @@ groups:
- AcceptanceTest
- IntegrationTest
- UpgradeTest
+ - StressNewTests
jobs:
- name: Build
diff --git a/ci/pipelines/pull-request/deploy_pr_pipeline.sh
b/ci/pipelines/pull-request/deploy_pr_pipeline.sh
index da281ad..9237711 100755
--- a/ci/pipelines/pull-request/deploy_pr_pipeline.sh
+++ b/ci/pipelines/pull-request/deploy_pr_pipeline.sh
@@ -71,6 +71,18 @@ for i in ${GEODEBUILDDIR}/test-stubs/*.yml; do
${i} > ${TMP_DIR}/${X}
done
+for i in ${SCRIPTDIR}/test-stubs/*.yml; do
+ X=pull-request-$(basename $i)
+ echo "Merging ${i} into ${TMP_DIR}/${X}"
+ ${SPRUCE} merge --prune metadata \
+<(echo "metadata:"; \
+ echo " geode-build-branch: ${GEODE_BRANCH}"; \
+ echo " geode-fork: ${GEODE_FORK}"; \
+ echo " ") \
+${SCRIPTDIR}/pr-template.yml \
+${i} > ${TMP_DIR}/${X}
+done
+
echo "Spruce branch-name into resources"
${SPRUCE} merge --prune metadata \
${SCRIPTDIR}/base.yml \
diff --git a/ci/pipelines/pull-request/pr-template.yml
b/ci/pipelines/pull-request/pr-template.yml
index 8e85457..722bee8 100644
--- a/ci/pipelines/pull-request/pr-template.yml
+++ b/ci/pipelines/pull-request/pr-template.yml
@@ -107,7 +107,7 @@ jobs:
GRADLE_TASK_OPTIONS: (( grab metadata.job.gradle_task_options || ""
))
ARTIFACT_SLUG: (( grab metadata.job.artifact_slug ))
run:
- path: geode-ci/ci/scripts/execute_tests.sh
+ path: (( grab metadata.job.execute_command ||
"geode/ci/scripts/execute_tests.sh" ))
on_success:
do:
- put: pull-request-job-success
diff --git a/ci/pipelines/pull-request/test-stubs/newtests.yml
b/ci/pipelines/pull-request/test-stubs/newtests.yml
new file mode 100644
index 000..33fd689
--- /dev/null
+++ b/ci/pipelines/pull-request/test-stubs/newtests.yml
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+metadata:
+ job:
+name: StressNewTests
+gradle_task: repeatTest
+artifact_slug: stressnewtestfiles
+execute_command: geode/ci/scripts/repeat-new-tests.sh
+dunit:
+ parallel: true
+# max number of docker containers to run, generally cpus/2
+ forks: 24
+cpus: 96
+# specified in Gigabytes.
+ram: 210
+# specified in seconds
+call_stack_timeout: 7200
+timeout: 2h15m
+size: []
diff --git a/ci/scripts/archive_results.sh b/ci/scripts/archive_results.sh
index bce4fcd..58ed6b6 100755
--- a/ci/scripts/archive_results.sh
+++ b/ci/scripts/archive_results.sh
@@ -113,7 +113,7 @@
TEST_RESULTS_DESTINATION="${ARTIFACTS_DESTINATION}/test-results/${SANITIZED_GRAD
TEST_ARTIFACTS_DESTINATION="${ARTIFACTS_DESTINATION}/test-artifacts/${BUILD_TIMESTAMP}/"
-if [ ! -d "${GEODE_BUILD}/build/reports/combined" ]; then
+if [ ! -f "${GEODE_BUILD}/build/reports/combined/index.html" ]; then
echo "No tests exis
[geode] branch develop updated: Reducing the parallelism of DistributedTest
This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new 1d8c322 Reducing the parallelism of DistributedTest 1d8c322 is described below commit 1d8c322574f52ca356d8cc5b8049e782005f9dba Author: Dan Smith AuthorDate: Tue Aug 14 15:26:04 2018 -0700 Reducing the parallelism of DistributedTest We were seeing 5% of our builds fail with membership errors due to heartbeat timeouts. We also see that the DistributedTest job is running with a 300 load average. Reducing the parallelism to avoid overloading the machine. --- ci/pipelines/geode-build/test-stubs/distributed.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/pipelines/geode-build/test-stubs/distributed.yml b/ci/pipelines/geode-build/test-stubs/distributed.yml index da4ca1c..aa5fd27 100644 --- a/ci/pipelines/geode-build/test-stubs/distributed.yml +++ b/ci/pipelines/geode-build/test-stubs/distributed.yml @@ -22,11 +22,11 @@ metadata: dunit: parallel: true # max number of docker containers to run, generally cpus/2 - forks: 48 + forks: 24 cpus: 96 # specified in Gigabytes. ram: 180 # specified in seconds -call_stack_timeout: 3600 -timeout: 1h15m +call_stack_timeout: 7200 +timeout: 2h15m size: []
[geode-native] branch develop updated: Exclude build directory etc from source distribution ... (#331)
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new cadf552 Exclude build directory etc from source distribution ...
(#331)
cadf552 is described below
commit cadf5522f43cd8d5cfd132f1451a507a03fca381
Author: Blake Bender
AuthorDate: Tue Aug 14 21:42:41 2018 +
Exclude build directory etc from source distribution ... (#331)
* Exclude build directory etc from source distribution generated by CPack.
Ignore .git and .idea (and .DS_Store)
* use .gitignore as base list for cpack exclusion. Add '.cpackignore' file
to add things that git wants but cpack doesn't.
Co-authored-by: Ernest Burghardt
---
.cpackignore | 5 +
CMakeLists.txt | 14 ++
2 files changed, 19 insertions(+)
diff --git a/.cpackignore b/.cpackignore
new file mode 100644
index 000..8f18540
--- /dev/null
+++ b/.cpackignore
@@ -0,0 +1,5 @@
+/docker/
+/packer/
+/.git/
+/.DS_Store
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8df6632..e4d526f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,20 @@ set(CPACK_RESOURCE_FILE_LICENSE
"${CMAKE_CURRENT_SOURCE_DIR}/dist/LICENSE")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
set(CPACK_GENERATOR TGZ;ZIP)
+# Build a comprehensive list of things to leave out of the cpack package for
our
+# source code releases. Use .gitignore as a base, then use '.cpackignore' to
+# leave out .git and a couple other items we want in the repository but not in
+# the release. Everything gets concatenated into a ';' separated list for
+# cpack.
+file(READ ".gitignore" IGNORED_PARTIAL)
+set(IGNORED_FULL ${IGNORED_PARTIAL})
+file(READ ".cpackignore" IGNORED_PARTIAL)
+string(CONCAT IGNORED_FULL ${IGNORED_FULL} ${IGNORED_PARTIAL})
+string(REGEX REPLACE "\n" ";" IGNORED_FULL "${IGNORED_FULL}")
+string(REGEX REPLACE " " "" IGNORED_FULL "${IGNORED_FULL}")
+
+list(APPEND CPACK_SOURCE_IGNORE_FILES ${IGNORED_FULL})
+
option(ENABLE_CLANG_TIDY "Enable clang-tidy checks." false)
if(ENABLE_CLANG_TIDY)
find_program(CLANG_TIDY "clang-tidy")
[geode] branch feature/GEODE-3780 updated: GEODE-3780 suspected member is never watched again after passing final check
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-3780
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-3780 by this
push:
new 38b75a9 GEODE-3780 suspected member is never watched again after
passing final check
38b75a9 is described below
commit 38b75a90b2164c0dfd3deb8ef21b059befc9168b
Author: Bruce Schuchardt
AuthorDate: Tue Aug 14 13:23:56 2018 -0700
GEODE-3780 suspected member is never watched again after passing final check
Changes to address Darrel's review comments
---
.../internal/membership/gms/ServiceConfig.java | 27 --
.../membership/gms/fd/GMSHealthMonitor.java| 13 +++
.../membership/gms/membership/GMSJoinLeave.java| 4 +++-
3 files changed, 15 insertions(+), 29 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
index 395e94d..09e2ed8 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
@@ -27,11 +27,12 @@ public class ServiceConfig {
public static final long MEMBER_REQUEST_COLLECTION_INTERVAL =
Long.getLong(DistributionConfig.GEMFIRE_PREFIX +
"member-request-collection-interval", 300);
+ /** in a small cluster we might want to involve all members in operations */
+ public static final int SMALL_CLUSTER_SIZE = 9;
+
/** various settings from Geode configuration */
private final long joinTimeout;
private final int[] membershipPortRange;
- private final int udpRecvBufferSize;
- private final int udpSendBufferSize;
private final long memberTimeout;
private Integer lossThreshold;
private final Integer memberWeight;
@@ -79,12 +80,8 @@ public class ServiceConfig {
return networkPartitionDetectionEnabled;
}
- public void setNetworkPartitionDetectionEnabled(boolean enabled) {
-this.networkPartitionDetectionEnabled = enabled;
- }
-
public boolean areLocatorsPreferredAsCoordinators() {
-boolean locatorsAreCoordinators = false;
+boolean locatorsAreCoordinators;
if (networkPartitionDetectionEnabled) {
locatorsAreCoordinators = true;
@@ -139,24 +136,8 @@ public class ServiceConfig {
membershipPortRange = theConfig.getMembershipPortRange();
-udpRecvBufferSize =
DistributionConfig.DEFAULT_UDP_RECV_BUFFER_SIZE_REDUCED;
-udpSendBufferSize = theConfig.getUdpSendBufferSize();
-
memberTimeout = theConfig.getMemberTimeout();
-// The default view-ack timeout in 7.0 is 12347 ms but is adjusted based
on the member-timeout.
-// We don't want a longer timeout than 12437 because new members will
likely time out trying to
-// connect because their join timeouts are set to expect a shorter period
-int ackCollectionTimeout = theConfig.getMemberTimeout() * 2 * 12437 /
1;
-if (ackCollectionTimeout < 1500) {
- ackCollectionTimeout = 1500;
-} else if (ackCollectionTimeout > 12437) {
- ackCollectionTimeout = 12437;
-}
-ackCollectionTimeout = Integer
-.getInteger(DistributionConfig.GEMFIRE_PREFIX + "VIEW_ACK_TIMEOUT",
ackCollectionTimeout)
-.intValue();
-
lossThreshold =
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX +
"network-partition-threshold", 51);
if (lossThreshold < 51)
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index d66155b..f31a0c3 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -66,6 +66,7 @@ import
org.apache.geode.distributed.internal.InternalDistributedSystem;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
+import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
import org.apache.geode.distributed.internal.membership.gms.Services;
import
org.apache.geode.distributed.internal.membership.gms.interfaces.HealthMonitor;
import
org.apache.geode.distributed.internal.membership.gms.interfaces.MessageHandler;
@@ -1001,8 +1002,8 @@ public class GMSHealthMonitor implements HealthMonitor,
MessageHandler {
@Override
public void memberSuspected(InternalDistributedMember initiator,
InternalDistributedMember suspect, String reason)
[geode] branch develop updated: GEODE-5530 Add geode-protobuf-test subproject for test-structure reuse (#2324)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 83c6c09 GEODE-5530 Add geode-protobuf-test subproject for
test-structure reuse (#2324)
83c6c09 is described below
commit 83c6c0929e748646fd22871f6726746235b2a5cb
Author: Jacob Barrett
AuthorDate: Tue Aug 14 13:16:33 2018 -0700
GEODE-5530 Add geode-protobuf-test subproject for test-structure reuse
(#2324)
Co-authored-by: Robert Houghton
Co-authored-by: Jacob Barrett
---
geode-protobuf/build.gradle| 7 +++
.../{ => geode-protobuf-test}/build.gradle | 21 -
.../internal/protocol/TestExecutionContext.java| 0
.../internal/protocol/protobuf/v1/MessageUtil.java | 0
.../protobuf/v1/ProtobufRequestUtilities.java | 0
.../protobuf/v1/TestSerializeAllSerializer.java| 0
.../protocol/protobuf/v1/TestValueSerializer.java | 0
...he.geode.protocol.serialization.ValueSerializer | 0
.../protobuf/v1/acceptance/default.keystore| Bin
settings.gradle| 1 +
10 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index 33d57fa..d319b97 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -23,12 +23,11 @@ dependencies {
testCompile project(':geode-core')
testCompile project(':geode-junit')
+testCompile project(":geode-protobuf/geode-protobuf-test")
integrationTestCompile project(":geode-dunit")
-// TODO remove common source dependency
-integrationTestCompile sourceSets.test.output
+integrationTestCompile project(":geode-protobuf/geode-protobuf-test")
-// TODO remove common source dependency
-distributedTestCompile sourceSets.test.output
+distributedTestCompile project(":geode-protobuf/geode-protobuf-test")
}
diff --git a/geode-protobuf/build.gradle
b/geode-protobuf/geode-protobuf-test/build.gradle
old mode 100644
new mode 100755
similarity index 62%
copy from geode-protobuf/build.gradle
copy to geode-protobuf/geode-protobuf-test/build.gradle
index 33d57fa..dfc4e2f
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/geode-protobuf-test/build.gradle
@@ -15,20 +15,15 @@
* limitations under the License.
*/
-dependencies {
-compileOnly project(':geode-core')
-compile project(':geode-protobuf-messages')
-compile 'com.google.protobuf:protobuf-java:' +
project.'protobuf-java.version'
-
-
-testCompile project(':geode-core')
-testCompile project(':geode-junit')
+dependencies {
+ compileOnly project(':geode-protobuf')
+ compileOnly project(':geode-core')
-integrationTestCompile project(":geode-dunit")
-// TODO remove common source dependency
-integrationTestCompile sourceSets.test.output
+ compile project(':geode-common')
+ compile 'junit:junit:' + project.'junit.version'
+ compile 'org.mockito:mockito-core:' + project.'mockito-core.version'
-// TODO remove common source dependency
-distributedTestCompile sourceSets.test.output
}
+
+disableMavenPublishing()
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/TestExecutionContext.java
b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/TestExecutionContext.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/TestExecutionContext.java
rename to
geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/TestExecutionContext.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java
b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java
rename to
geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufRequestUtilities.java
b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufRequestUtilities.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufRequestUtilities.java
rename to
geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufRequestUtilities.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/TestSerializeAllSerializer.java
b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/TestSerializeA
[geode] branch develop updated: GEODE-5530: Creates geode-lucene/geode-lucene-test (#2317)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 5e6d2db GEODE-5530: Creates geode-lucene/geode-lucene-test (#2317)
5e6d2db is described below
commit 5e6d2dbe1bbb5b63b161e753f92e4eed8b200a79
Author: Jacob Barrett
AuthorDate: Tue Aug 14 11:55:49 2018 -0700
GEODE-5530: Creates geode-lucene/geode-lucene-test (#2317)
---
geode-lucene/build.gradle | 10
geode-lucene/geode-lucene-test/build.gradle| 27 ++
.../geode/cache/lucene/DummyLuceneSerializer.java | 0
.../geode/cache/lucene/LuceneIntegrationTest.java | 0
.../lucene/internal/LuceneIndexFactorySpy.java | 0
.../internal/repository/serializer/Type1.java | 0
.../internal/repository/serializer/Type2.java | 0
.../apache/geode/cache/lucene/test/Customer.java | 0
.../geode/cache/lucene/test/IndexRegionSpy.java| 0
.../cache/lucene/test/IndexRepositorySpy.java | 0
.../test/LuceneDeclarable2TestSerializer.java | 0
.../cache/lucene/test/LuceneTestSerializer.java| 0
.../cache/lucene/test/LuceneTestUtilities.java | 0
.../org/apache/geode/cache/lucene/test/Page.java | 0
.../org/apache/geode/cache/lucene/test/Person.java | 0
.../apache/geode/cache/lucene/test/TestObject.java | 0
.../geode/cache/lucene/test/package-info.java | 0
...fyDifferentFieldAnalyzerSizesFails1.1.cache.xml | 0
...fyDifferentFieldAnalyzerSizesFails1.2.cache.xml | 0
...fyDifferentFieldAnalyzerSizesFails2.1.cache.xml | 0
...fyDifferentFieldAnalyzerSizesFails2.2.cache.xml | 0
...verifyDifferentFieldAnalyzersFails1.1.cache.xml | 0
...verifyDifferentFieldAnalyzersFails1.2.cache.xml | 0
...verifyDifferentFieldAnalyzersFails2.1.cache.xml | 0
...verifyDifferentFieldAnalyzersFails2.2.cache.xml | 0
...verifyDifferentFieldAnalyzersFails3.1.cache.xml | 0
...verifyDifferentFieldAnalyzersFails3.2.cache.xml | 0
...UnitTest.verifyDifferentFieldsFails.1.cache.xml | 0
...UnitTest.verifyDifferentFieldsFails.2.cache.xml | 0
...Test.verifyDifferentIndexNamesFails.1.cache.xml | 0
...Test.verifyDifferentIndexNamesFails.2.cache.xml | 0
...itTest.verifyDifferentIndexesFails1.1.cache.xml | 0
...itTest.verifyDifferentIndexesFails1.2.cache.xml | 0
...itTest.verifyDifferentIndexesFails2.1.cache.xml | 0
...itTest.verifyDifferentIndexesFails2.2.cache.xml | 0
...tionDUnitTest.verifyXMLEmptyIndexList.cache.xml | 0
...nDUnitTest.verifyXMLMultipleIndexList.cache.xml | 0
...arserIntegrationJUnitTest.createIndex.cache.xml | 0
...uceneElementShouldThrowParseException.cache.xml | 0
...dXmlLocationShouldThrowParseException.cache.xml | 0
...t.invalidXmlShouldThrowParseException.cache.xml | 0
...ParserIntegrationJUnitTest.parseIndex.cache.xml | 0
...tionJUnitTest.parseIndexWithAnalyzers.cache.xml | 0
...ionJUnitTest.parseIndexWithSerializer.cache.xml | 0
...exWithSerializerAndDeclarableProperty.cache.xml | 0
...eIndexWithSerializerAndStringProperty.cache.xml | 0
settings.gradle| 1 +
47 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index 47ac3a7..cdab867 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -26,28 +26,26 @@ dependencies {
runtime 'org.apache.lucene:lucene-analyzers-phonetic:' +
project.'lucene.version'
testCompile project(':geode-junit')
+testCompile project(':geode-lucene/geode-lucene-test')
testCompile 'org.apache.lucene:lucene-test-framework:' +
project.'lucene.version'
testCompile 'com.pholser:junit-quickcheck-generators:' +
project.'junit-quickcheck.version'
integrationTestCompile project(":geode-dunit")
+integrationTestCompile project(':geode-lucene/geode-lucene-test')
integrationTestCompile 'org.apache.lucene:lucene-analyzers-phonetic:' +
project.'lucene.version'
integrationTestCompile 'pl.pragmatists:JUnitParams:' +
project.'JUnitParams.version'
-// TODO fix dependency on shared classes
-integrationTestCompile sourceSets.test.output
+distributedTestCompile project(':geode-lucene/geode-lucene-test')
distributedTestCompile 'pl.pragmatists:JUnitParams:' +
project.'JUnitParams.version'
-// TODO fix dependency on shared classes
-distributedTestCompile sourceSets.test.output
upgradeTestCompile project(":geode-dunit")
performanceTestCompile project(":geode-junit")
-// TODO fix dependency on shared classes
-performanceTestCompile sourceSets.test.output
+performanceTestCompile project(':geode-lucene/geode-lucene-test')
}
//The lucene integration tests don't have any issues that requiring forking
diff --git a/geode-lucene/geode-lucene-test/build.gradle
b/geode-lucene/geode-lucene-t
[geode] branch develop updated: Revert "[GEODE-5580] Convert test-container image to use alpine."
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new c4ee03d Revert "[GEODE-5580] Convert test-container image to use alpine." c4ee03d is described below commit c4ee03d79d001769e58d7b86a26e2634a23d0949 Author: Jacob Barrett AuthorDate: Tue Aug 14 10:57:30 2018 -0700 Revert "[GEODE-5580] Convert test-container image to use alpine." This reverts commit 4b41429bd3846eef4a31dbc70efb88fed2082227. --- ci/images/test-container/Dockerfile | 31 +-- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/ci/images/test-container/Dockerfile b/ci/images/test-container/Dockerfile index d72e96b..a8a6d86 100644 --- a/ci/images/test-container/Dockerfile +++ b/ci/images/test-container/Dockerfile @@ -13,12 +13,31 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM openjdk:8-jdk-alpine +FROM openjdk:8 ENTRYPOINT [] +ARG CHROME_DRIVER_VERSION=2.35 -RUN apk --no-cache add \ - bash \ - shadow \ - && useradd --shell /bin/bash -u 93043 -o -c "" -m geode -WORKDIR /home/geode +WORKDIR /tmp/work +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + apt-transport-https \ + lsb-release \ + && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ + && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ +aptitude \ +ca-certificates \ +google-chrome-stable \ + && wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \ + && rm -rf /opt/selenium/chromedriver \ + && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \ + && rm /tmp/chromedriver_linux64.zip \ + && mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \ + && chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \ + && ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver \ + && useradd --shell /bin/bash -u 93043 -o -c "" -m geode \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/work
[geode] branch develop updated: GEODE-5530: Creates extensions/geode-module-test (#2313)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 34ce6cd GEODE-5530: Creates extensions/geode-module-test (#2313)
34ce6cd is described below
commit 34ce6cd36773782a0d4b9a8fab8961b2e1ebd2c2
Author: Jacob Barrett
AuthorDate: Tue Aug 14 10:03:48 2018 -0700
GEODE-5530: Creates extensions/geode-module-test (#2313)
---
.../build.gradle| 21 +++--
.../org/apache/geode/modules/session/Callback.java | 0
.../geode/modules/session/CommandServlet.java | 0
.../geode/modules/session/EmbeddedTomcat.java | 0
.../apache/geode/modules/session/QueryCommand.java | 0
.../geode/modules/session/TestSessionsBase.java | 0
extensions/geode-modules-tomcat7/build.gradle | 5 +
extensions/geode-modules-tomcat8/build.gradle | 16 +---
extensions/geode-modules/build.gradle | 8 +++-
settings.gradle | 1 +
10 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/extensions/geode-modules/build.gradle
b/extensions/geode-modules-test/build.gradle
similarity index 61%
copy from extensions/geode-modules/build.gradle
copy to extensions/geode-modules-test/build.gradle
index 67dc91f..3084802 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules-test/build.gradle
@@ -15,26 +15,19 @@
* limitations under the License.
*/
-evaluationDependsOn(":geode-core")
-
dependencies {
- compile project(':geode-core')
-
- compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
- compile ('org.apache.tomcat:catalina-ha:' + project.'tomcat6.version') {
+ compileOnly ('org.apache.tomcat:catalina-ha:' + project.'tomcat6.version') {
exclude module: 'annotations-api'
exclude module: 'coyote'
exclude module: 'tribes'
}
- compile 'org.apache.tomcat:juli:' + project.'tomcat6.version'
-
- testCompile project(':geode-junit')
- testCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
-
- integrationTestCompile project(":geode-dunit")
- integrationTestCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
- integrationTestCompile 'org.apache.tomcat:coyote:' +
project.'tomcat6.version'
+ compile(project(':extensions/geode-modules')) {
+// Remove everything related to Tomcat 6.x
+exclude group: 'org.apache.tomcat'
+ }
+ compile project(':geode-junit')
+ compile 'org.httpunit:httpunit:' + project.'httpunit.version'
}
disableMavenPublishing()
diff --git
a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Callback.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/Callback.java
similarity index 100%
rename from
extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Callback.java
rename to
extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/Callback.java
diff --git
a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/CommandServlet.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/CommandServlet.java
similarity index 100%
rename from
extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/CommandServlet.java
rename to
extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/CommandServlet.java
diff --git
a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/EmbeddedTomcat.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/EmbeddedTomcat.java
similarity index 100%
rename from
extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/EmbeddedTomcat.java
rename to
extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/EmbeddedTomcat.java
diff --git
a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/QueryCommand.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/QueryCommand.java
similarity index 100%
rename from
extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/QueryCommand.java
rename to
extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/QueryCommand.java
diff --git
a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/TestSessionsBase.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/TestSessionsBase.java
similarity index 100%
rename from
extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/TestSessionsBase.java
rename to
extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/TestSessionsBase.java
diff
[geode] branch debug-alter-runtime updated: GEODE-5530: Add geode-core project to distributedTestRuntimeOnly
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch debug-alter-runtime
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/debug-alter-runtime by this
push:
new 5bc43a2 GEODE-5530: Add geode-core project to
distributedTestRuntimeOnly
5bc43a2 is described below
commit 5bc43a2cfe149c84225b37e19a1cc4b597ec13c5
Author: Jens Deppe
AuthorDate: Tue Aug 14 09:33:17 2018 -0700
GEODE-5530: Add geode-core project to distributedTestRuntimeOnly
---
geode-connectors/build.gradle | 2 ++
geode-cq/build.gradle | 2 ++
geode-lucene/build.gradle | 46 ++-
geode-protobuf/build.gradle | 22 ++---
geode-wan/build.gradle| 4 +---
geode-web/build.gradle| 1 +
6 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index 8b1035e..c9ec4d7 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -42,6 +42,8 @@ dependencies {
acceptanceTestRuntime group: 'org.apache.derby', name: 'derby', version:
project.'derby.version'
acceptanceTestRuntime group: 'org.postgresql', name: 'postgresql', version:
'42.2.2'
+
+ distributedTestRuntimeOnly project(':geode-core')
}
integrationTest.forkEvery 0
\ No newline at end of file
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index 9d0b77b..84452f2 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -24,4 +24,6 @@ dependencies {
integrationTestCompile project(":geode-dunit")
upgradeTestCompile project(":geode-dunit")
+
+ distributedTestRuntimeOnly project(':geode-core')
}
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index 47ac3a7..6f4afac 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -16,38 +16,40 @@
*/
dependencies {
-compile project(':geode-core')
-compile project(':geode-common')
-compile 'org.apache.lucene:lucene-analyzers-common:' +
project.'lucene.version'
-compile ('org.apache.lucene:lucene-queryparser:' +
project.'lucene.version') {
- exclude module: 'lucene-sandbox'
-}
+ compile project(':geode-core')
+ compile project(':geode-common')
+ compile 'org.apache.lucene:lucene-analyzers-common:' +
project.'lucene.version'
+ compile ('org.apache.lucene:lucene-queryparser:' + project.'lucene.version')
{
+exclude module: 'lucene-sandbox'
+ }
-runtime 'org.apache.lucene:lucene-analyzers-phonetic:' +
project.'lucene.version'
+ runtime 'org.apache.lucene:lucene-analyzers-phonetic:' +
project.'lucene.version'
-testCompile project(':geode-junit')
-testCompile 'org.apache.lucene:lucene-test-framework:' +
project.'lucene.version'
-testCompile 'com.pholser:junit-quickcheck-generators:' +
project.'junit-quickcheck.version'
+ testCompile project(':geode-junit')
+ testCompile 'org.apache.lucene:lucene-test-framework:' +
project.'lucene.version'
+ testCompile 'com.pholser:junit-quickcheck-generators:' +
project.'junit-quickcheck.version'
-integrationTestCompile project(":geode-dunit")
-integrationTestCompile 'org.apache.lucene:lucene-analyzers-phonetic:' +
project.'lucene.version'
-integrationTestCompile 'pl.pragmatists:JUnitParams:' +
project.'JUnitParams.version'
-// TODO fix dependency on shared classes
-integrationTestCompile sourceSets.test.output
+ integrationTestCompile project(":geode-dunit")
+ integrationTestCompile 'org.apache.lucene:lucene-analyzers-phonetic:' +
project.'lucene.version'
+ integrationTestCompile 'pl.pragmatists:JUnitParams:' +
project.'JUnitParams.version'
+ // TODO fix dependency on shared classes
+ integrationTestCompile sourceSets.test.output
-distributedTestCompile 'pl.pragmatists:JUnitParams:' +
project.'JUnitParams.version'
-// TODO fix dependency on shared classes
-distributedTestCompile sourceSets.test.output
+ distributedTestCompile 'pl.pragmatists:JUnitParams:' +
project.'JUnitParams.version'
+ // TODO fix dependency on shared classes
+ distributedTestCompile sourceSets.test.output
-upgradeTestCompile project(":geode-dunit")
+ upgradeTestCompile project(":geode-dunit")
-performanceTestCompile project(":geode-junit")
-// TODO fix dependency on shared classes
-performanceTestCompile sourceSets.test.output
+ performanceTestCompile project(":geode-junit")
+ // TODO fix dependency on shared classes
+ performanceTestCompile sourceSets.test.output
+
+ distributedTestRuntimeOnly project(':geode-core')
}
//The lucene integration tests don't have any issues that requiring forking
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index 33d57fa..9bc8210 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -16,19 +16,19 @@
*/
dependencies {
-compileOnly project(':geod
