[geode] branch support/1.14 updated: debug stress-new-test
This is an automated email from the ASF dual-hosted git repository.
rhoughton pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new a58f935 debug stress-new-test
a58f935 is described below
commit a58f935d9c8627298b457b58948266e201fc3001
Author: Robert Houghton
AuthorDate: Tue Mar 22 19:50:53 2022 -0700
debug stress-new-test
---
ci/scripts/repeat-new-tests.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ci/scripts/repeat-new-tests.sh b/ci/scripts/repeat-new-tests.sh
index 90dc7d8..dc4afb1 100755
--- a/ci/scripts/repeat-new-tests.sh
+++ b/ci/scripts/repeat-new-tests.sh
@@ -49,10 +49,13 @@ function changes_for_path() {
function save_classpath() {
echo "Building and saving classpath"
pushd geode >> /dev/null
+printenv
+set -x
BUILD_LOG=/tmp/classpath-build.log
# Do this twice since devBuild still dumps a warning string to stdout.
./gradlew --console=plain -q compileTestJava compileIntegrationTestJava
compileDistributedTestJava devBuild >${BUILD_LOG} 2>&1 || (cat ${BUILD_LOG};
false)
./gradlew --console=plain -q printTestClasspath 2>/dev/null
>/tmp/classpath.txt
+set +x
popd >> /dev/null
}
[geode] branch develop updated: GEODE-10048: Add framework for Redis events and BLPOP command (#7408)
This is an automated email from the ASF dual-hosted git repository. jensdeppe 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 6b43b76 GEODE-10048: Add framework for Redis events and BLPOP command (#7408) 6b43b76 is described below commit 6b43b76e3d5a9c5b0c84df8e1995d61528871068 Author: Jens Deppe AuthorDate: Tue Mar 22 19:47:00 2022 -0700 GEODE-10048: Add framework for Redis events and BLPOP command (#7408) * GEODE-10048: Add framework for Redis events and BLPOP command This commit adds a simple eventing framework to be used by blocking commands as well as keyspace event notification (still to be implemented). The main components are: - EventListener: an interface to be immplemented by anything wishing to receive events. Currently only implemented for blocking commands in the form of BlockingCommandListener. - EventDistributor: the component to which listeners are registered and where events are received and distributed. A single EventDistributor exists in the system and is associated with each ExecutionHandlerContext. - Event: not implemented as a separate class but logically consists of the command (RedisCommandType) and key (RedisKey). When a blocking command receives a relevant event the command is resubmitted into the Netty pipeline. This also means that something could happen (another command) that causes the blocking command to re-block and not complete. This is also what happens with native Redis. For example: - BLPOP 0 A executes and blocks - LPUSH A some-value - Before LPUSH fires an event, LPOP A is received but needs to wait to acquire the lock on A - LPUSH fires an event which the BLPOP listener receives and resubmits BLPOP into the pipeline - Once LPUSH completes, LPOP is next and removes A - BLPOP A runs and ends up blocking again because there is nothing to pop from A --- .../list/BLPopNativeRedisAcceptanceTest.java | 41 .../commands/executor/list/BLPopDUnitTest.java | 120 .../list/AbstractBLPopIntegrationTest.java | 201 +++ .../executor/list/BLPopIntegrationTest.java| 37 .../server/AbstractHitsMissesIntegrationTest.java | 6 + .../eventing/BlockingCommandListenerTest.java | 182 ++ .../internal/eventing/EventDistributorTest.java| 213 + .../apache/geode/codeAnalysis/excludedClasses.txt | 23 +-- .../geode/redis/internal/GeodeRedisServer.java | 12 +- .../geode/redis/internal/RedisConstants.java | 2 + .../geode/redis/internal/commands/Command.java | 21 +- .../redis/internal/commands/RedisCommandType.java | 3 + .../internal/commands/executor/RedisResponse.java | 12 ++ .../commands/executor/list/BLPopExecutor.java | 61 ++ .../commands/executor/list/LPushExecutor.java | 5 +- .../commands/executor/list/RPushExecutor.java | 2 +- .../geode/redis/internal/data/NullRedisList.java | 17 +- .../geode/redis/internal/data/RedisList.java | 50 - .../internal/eventing/BlockingCommandListener.java | 123 .../redis/internal/eventing/EventDistributor.java | 105 ++ .../redis/internal/eventing/EventListener.java | 62 ++ .../redis/internal/eventing/EventResponse.java | 34 .../apache/geode/redis/internal/netty/Client.java | 6 +- .../apache/geode/redis/internal/netty/Coder.java | 6 + .../internal/netty/ExecutionHandlerContext.java| 46 +++-- .../redis/internal/netty/NettyRedisServer.java | 8 +- .../redis/internal/netty/StringBytesGlossary.java | 6 + .../redis/internal/services/RegionProvider.java| 4 +- .../netty/ExecutionHandlerContextTest.java | 2 +- 29 files changed, 1344 insertions(+), 66 deletions(-) diff --git a/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/commands/executor/list/BLPopNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/commands/executor/list/BLPopNativeRedisAcceptanceTest.java new file mode 100755 index 000..2c54bdd --- /dev/null +++ b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/commands/executor/list/BLPopNativeRedisAcceptanceTest.java @@ -0,0 +1,41 @@ +/* + * 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
[geode] 05/05: GEODE-9980: Improve error handling of serial filters (#7355)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5d9e4b5b54b84c2de28b670fe6feb0b0c3f7
Author: Kirk Lund
AuthorDate: Thu Feb 10 10:53:21 2022 -0800
GEODE-9980: Improve error handling of serial filters (#7355)
Improves the error handling of serial filter configuration and
filtering. The API throws a runtime exception wrapping any thrown
exceptions.
When geode.enableGlobalSerialFilter is FALSE:
* Startup succeeds without throwing any exceptions even if an older
version of Java throws "java.lang.ClassNotFoundException
sun.misc.ObjectInputFilter".
When geode.enableGlobalSerialFilter is TRUE:
* Startup fails by throwing an exception when configuration of serial
filter fails for any reason.
Renames ObjectInputFilter to avoid confusion with the Java interface of
the same name.
Fixes a bug found in ReflectiveFacadeGlobalSerialFilterTest which
resulted in configuring a non-mocked process-wide serial filter that
polluted the JVM for all later tests.
Fixes other minor details in LocatorLauncher, InternalDataSerializer
and various related tests.
(cherry picked from commit ce57e9fd2b8b644cadc469209e12e4fbd281e0d9)
(cherry picked from commit 6ecdce0d9ef9040f3bbb90c8ea4ff5eb99d712fc)
---
.../filter/SerialFilterAssertions.java | 30 +++---
.../apache/geode/distributed/LocatorLauncher.java | 16 ++-
.../apache/geode/distributed/ServerLauncher.java | 16 ++-
.../geode/internal/InternalDataSerializer.java | 29 --
.../geode/management/internal/ManagementAgent.java | 7 +-
.../geode/distributed/LocatorLauncherTest.java | 2 +-
...ationWhenFilterIsAlreadySetIntegrationTest.java | 53 ++
...enObjectInputFilterNotFoundIntegrationTest.java | 108
...nputFilterApiSetFilterBlankIntegrationTest.java | 1 -
java => FilterAlreadyConfiguredException.java} | 22 +++--
.../serialization/filter/FilterConfiguration.java | 2 +-
.../serialization/filter/GlobalSerialFilter.java | 5 +-
.../filter/GlobalSerialFilterConfiguration.java| 85 ++--
.../filter/JmxSerialFilterConfiguration.java | 15 +--
...nputFilter.java => NullStreamSerialFilter.java} | 4 +-
.../filter/ObjectInputFilterInvocationHandler.java | 109 +
.../filter/ReflectiveFacadeGlobalSerialFilter.java | 43 ++--
.../ReflectiveFacadeGlobalSerialFilterFactory.java | 20 ++--
.../ReflectiveFacadeObjectInputFilterFactory.java | 61
...ava => ReflectiveFacadeStreamSerialFilter.java} | 49 +++--
...ReflectiveFacadeStreamSerialFilterFactory.java} | 35 +++
.../filter/ReflectiveObjectInputFilterApi.java | 59 +++
...ectInputFilter.java => StreamSerialFilter.java} | 7 +-
...Factory.java => StreamSerialFilterFactory.java} | 4 +-
...ertyGlobalSerialFilterConfigurationFactory.java | 24 -
java => UnableToSetSerialFilterException.java} | 22 +++--
...anctioned-geode-serialization-serializables.txt | 2 +
.../GlobalSerialFilterConfigurationTest.java | 84
.../JmxSerialFilterConfigurationFactoryTest.java | 9 ++
.../filter/JmxSerialFilterConfigurationTest.java | 50 ++
.../filter/NullObjectInputFilterTest.java | 4 +-
.../ObjectInputFilterInvocationHandlerTest.java| 97 ++
...lectiveFacadeGlobalSerialFilterFactoryTest.java | 65 ++--
.../ReflectiveFacadeGlobalSerialFilterTest.java| 88 ++---
...flectiveFacadeObjectInputFilterFactoryTest.java | 12 +--
.../ReflectiveFacadeObjectInputFilterTest.java | 77 ++-
.../ReflectiveObjectInputFilterApiFactoryTest.java | 9 ++
.../filter/ReflectiveObjectInputFilterApiTest.java | 11 ++-
.../filter/SerialFilterAssertions.java | 53 +-
...GlobalSerialFilterConfigurationFactoryTest.java | 101 ---
...rtyJmxSerialFilterConfigurationFactoryTest.java | 12 ++-
41 files changed, 1067 insertions(+), 435 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/serialization/filter/SerialFilterAssertions.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/serialization/filter/SerialFilterAssertions.java
index b6d552a..8432e7d 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/serialization/filter/SerialFilterAssertions.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/serialization/filter/SerialFilterAssertions.java
@@ -30,35 +30,29 @@ public class SerialFilterAssertions {
public static void assertThatSerialFilterIsNull()
throws InvocationTargetException, IllegalAccessException {
-boolean exists = API.getSerialFilter() != null;
-assertThat(exists)
-
[geode] 03/05: GEODE-9879: Extract SystemProperty to geode-common (#7177)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2652bd65cd4192068de6c601f7ba92d120816593
Author: Kirk Lund
AuthorDate: Mon Dec 20 10:53:32 2021 -0800
GEODE-9879: Extract SystemProperty to geode-common (#7177)
Extract part of SystemPropertyHelper to geode-common for use in
modules that are upstream from geode-core.
Define new DEFAULT_PREFIX that maps to GEODE_PREFIX and use that
everywhere that GEODE_PREFIX was previously used.
* Inline prefix constants in SystemPropertyHelper
* Use static imports for system property prefixes.
* Split up large tests in SystemPropertyHelperTest.
* Fix JAXBService
(cherry picked from commit ebf8479fffb5775b1f45801aa9382c2dad7106e0)
---
geode-common/build.gradle | 3 +
.../apache/geode/internal/lang/SystemProperty.java | 118
.../geode/internal/lang/SystemPropertyTest.java| 107 +++
...okenSerializationConsistencyRegressionTest.java | 6 +-
...entDeserializationCopyOnReadRegressionTest.java | 7 +-
.../cache/CompactOfflineDiskStoreDUnitTest.java| 5 +-
.../internal/cache/DeltaPropagationDUnitTest.java | 2 +-
.../cache/ParallelDiskStoreRecoveryDUnitTest.java | 5 +-
.../cache/PartitionedRegionSingleHopDUnitTest.java | 2 +-
.../cache/ValidateOfflineDiskStoreDUnitTest.java | 5 +-
.../RebalanceOperationComplexDistributedTest.java | 4 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 5 +-
.../ha/HARegionQueueExpiryRegressionTest.java | 5 +-
.../HARegionQueueThreadIdExpiryRegressionTest.java | 8 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 2 +-
.../internal/cache/ha/HARegionQueueJUnitTest.java | 4 +-
.../DefaultDiskDirsIntegrationTest.java| 4 +-
.../internal/cache/EntryEventSerialization.java| 2 +-
.../cache/eviction/EvictionListBuilder.java| 3 +-
.../cache/eviction/LRUListWithAsyncSorting.java| 5 +-
.../cache/eviction/LRUListWithSyncSorting.java | 3 +-
.../geode/internal/cache/ha/HARegionQueue.java | 2 +-
.../cache/persistence/DefaultDiskDirs.java | 2 +-
.../internal/cache/xmlcache/CacheCreation.java | 3 +-
.../apache/geode/internal/config/JAXBService.java | 6 +-
.../geode/internal/lang/SystemPropertyHelper.java | 76 +++
.../internal/logging/CoreLoggingExecutors.java | 2 +-
.../geode/logging/internal/Configuration.java | 6 +-
.../logging/internal/LoggingProviderLoader.java| 5 +-
.../cache/EntryEventSerializationTest.java | 4 +-
.../cache/persistence/DefaultDiskDirsTest.java | 6 +-
.../PersistenceInitialImageAdvisorTest.java| 5 +-
.../internal/lang/SystemPropertyHelperTest.java| 148 -
.../DistributedDiskDirRuleDistributedTest.java | 17 ++-
.../junit/rules/DiskDirRuleIntegrationTest.java| 5 +-
.../test/dunit/rules/DistributedDiskDirRule.java | 16 ++-
.../apache/geode/test/junit/rules/DiskDirRule.java | 14 +-
37 files changed, 398 insertions(+), 224 deletions(-)
diff --git a/geode-common/build.gradle b/geode-common/build.gradle
index 9c23308..f5700ca 100755
--- a/geode-common/build.gradle
+++ b/geode-common/build.gradle
@@ -27,6 +27,9 @@ dependencies {
implementation('com.fasterxml.jackson.core:jackson-databind')
// test
+ testImplementation('com.github.stefanbirkner:system-rules') {
+exclude module: 'junit-dep'
+ }
testImplementation('junit:junit')
testImplementation('org.apache.commons:commons-lang3')
testImplementation('org.assertj:assertj-core')
diff --git
a/geode-common/src/main/java/org/apache/geode/internal/lang/SystemProperty.java
b/geode-common/src/main/java/org/apache/geode/internal/lang/SystemProperty.java
new file mode 100644
index 000..2c433ef
--- /dev/null
+++
b/geode-common/src/main/java/org/apache/geode/internal/lang/SystemProperty.java
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ */
+package org.apache.geode.internal.lang;
+
+import java.util.Optional;
+
+public class SystemP
[geode] 02/05: GEODE-9758: Move ClassUtils to geode-common (#7166)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e821d6eff4541ae478a0eb67217bcb456abae97a
Author: Kirk Lund
AuthorDate: Fri Dec 10 11:28:17 2021 -0800
GEODE-9758: Move ClassUtils to geode-common (#7166)
(cherry picked from commit b6fca291378a1bc334b0f9927c899a1892442939)
---
.../java/org/apache/geode/internal/lang/utils}/ClassUtils.java| 3 +--
.../java/org/apache/geode/internal/lang/utils/ClassUtilsTest.java | 8
.../main/java/org/apache/geode/distributed/AbstractLauncher.java | 2 +-
.../java/org/apache/geode/internal/InternalDataSerializer.java| 2 +-
.../InternalDataSerializerSerializationAcceptlistTest.java| 2 +-
.../geode/internal/InternalDataSerializerShiroAcceptListTest.java | 2 +-
.../internal/cli/commands/DescribeDiskStoreCommand.java | 2 +-
.../java/org/apache/geode/management/internal/cli/shell/Gfsh.java | 2 +-
.../java/org/apache/geode/codeAnalysis/CompiledClassUtils.java| 8 +---
.../internal/serialization/SerializationDependenciesTest.java | 3 ++-
.../java/org/apache/geode/rest/internal/web/util/NumberUtils.java | 2 +-
11 files changed, 19 insertions(+), 17 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/lang/ClassUtils.java
b/geode-common/src/main/java/org/apache/geode/internal/lang/utils/ClassUtils.java
similarity index 99%
rename from
geode-core/src/main/java/org/apache/geode/internal/lang/ClassUtils.java
rename to
geode-common/src/main/java/org/apache/geode/internal/lang/utils/ClassUtils.java
index 82bae79..b7ca20e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/ClassUtils.java
+++
b/geode-common/src/main/java/org/apache/geode/internal/lang/utils/ClassUtils.java
@@ -12,8 +12,7 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-
-package org.apache.geode.internal.lang;
+package org.apache.geode.internal.lang.utils;
import org.apache.geode.annotations.Immutable;
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
b/geode-common/src/test/java/org/apache/geode/internal/lang/utils/ClassUtilsTest.java
similarity index 97%
rename from
geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
rename to
geode-common/src/test/java/org/apache/geode/internal/lang/utils/ClassUtilsTest.java
index ad118ef..49e3714 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
+++
b/geode-common/src/test/java/org/apache/geode/internal/lang/utils/ClassUtilsTest.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.geode.internal.lang;
+package org.apache.geode.internal.lang.utils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -22,20 +22,20 @@ import static org.junit.Assert.assertTrue;
import java.util.Calendar;
import java.util.Date;
+import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
-
/**
* The ClassUtilsJUnitTest class is a test suite with test cases to test the
contract and
* functionality of the ClassUtils class.
*
*
- * @see org.apache.geode.internal.lang.ClassUtils
+ * @see ClassUtils
* @see org.junit.Assert
* @see org.junit.Test
* @since GemFire 7.0
*/
-public class ClassUtilsJUnitTest {
+public class ClassUtilsTest {
@Test
public void testForNameWithExistingClass() {
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
index 6734666..270b2a5 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
@@ -18,9 +18,9 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.join;
import static org.apache.commons.lang3.StringUtils.lowerCase;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.apache.geode.internal.lang.ClassUtils.forName;
import static org.apache.geode.internal.lang.StringUtils.defaultString;
import static org.apache.geode.internal.lang.SystemUtils.CURRENT_DIRECTORY;
+import static org.apache.geode.internal.lang.utils.ClassUtils.forName;
import java.io.File;
import java.io.FileReader;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index cba2560..9c5018a 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++
b/geode-core/src/main/java/o
[geode] 01/05: GEODE-9758: Move SanctionedSerializables to filter package (#7165)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3f66ab05e5683edb4bcb43e52304d8e5f58ac707
Author: Kirk Lund
AuthorDate: Thu Dec 9 10:15:20 2021 -0800
GEODE-9758: Move SanctionedSerializables to filter package (#7165)
Move SanctionedSerializables to new package
org.apache.geode.internal.serialization.filter.
(cherry picked from commit db64b4948e790d61e82f95ae6163a62adc4c67fb)
---
...ctionedSerializablesServiceIntegrationTest.java | 3 +-
.../RedisSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 2 +-
geode-common/build.gradle | 2 +-
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../ConnectorsSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
geode-core/build.gradle| 2 +
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../CoreSanctionedSerializablesService.java| 2 +-
.../geode/internal/InternalDataSerializer.java | 4 +-
.../internal/ObjectInputStreamFilterWrapper.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../internal/CQSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../DUnitSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...ctionedSerializablesServiceIntegrationTest.java | 25 +-
.../GfshSanctionedSerializablesService.java| 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...ctionedSerializablesServiceIntegrationTest.java | 5 +-
...nedSerializablesServiceIntegrationTestBase.java | 4 +-
.../categories/SanctionedSerializablesTest.java| 5 +-
.../JUnitSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../LuceneSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../ManagementSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
.../MembershipDependenciesJUnitTest.java | 1 -
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../MembershipSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../MemcachedSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
geode-serialization/build.gradle | 4 +
...ctionedSerializablesServiceIntegrationTest.java | 1 +
.../apache/geode/codeAnalysis/excludedClasses.txt | 0
...erializationSanctionedSerializablesService.java | 2 +
.../{ => filter}/SanctionedSerializables.java | 37 -
.../SanctionedSerializablesService.java| 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...est.java => SerializationDependenciesTest.java} | 20 ++---
.../filter/SanctionedSerializablesTest.java| 95 ++
.../src/test/resources/expected-pom.xml| 10 +++
...ctionedSerializablesServiceIntegrationTest.java | 4 +-
.../wan/WANSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
...ctionedSerializablesServiceIntegrationTest.java | 2 +-
.../WebApiSanctionedSerializablesService.java | 2 +-
...lization.filter.SanctionedSerializablesService} | 0
56 files changed, 219 insertions(+), 55 deletions(-)
diff --git
a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesServiceIntegrationTest.java
b/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesServiceIntegrationTest.java
index 420db71..8f9f4fe 100644
---
a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesServiceIntegrationTest.java
+++
b/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesServiceIntegrationTest.java
@@ -17,7 +17,8 @@ package org.apache.geode.redis.internal;
import org.junit.experimental.categories.Category;
import
org.apache.geode.codeAnalysis.SanctionedSerializablesServiceIntegrationTestBase;
-import org.apache.geode.internal.serialization.SanctionedSerializablesService;
+import
org.apache.geode.internal.serialization.filter.SanctionedSerializablesService;
+import
org.apache.geode.redis.inte
[geode] branch support/1.14 updated (05e7ba2 -> 5d9e4b5)
This is an automated email from the ASF dual-hosted git repository. klund pushed a change to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git. from 05e7ba2 Enable PR pipeline for support/1.14 new 3f66ab0 GEODE-9758: Move SanctionedSerializables to filter package (#7165) new e821d6e GEODE-9758: Move ClassUtils to geode-common (#7166) new 2652bd6 GEODE-9879: Extract SystemProperty to geode-common (#7177) new f0809e4 GEODE-9758: Add internal serial filter API (#7217) new 5d9e4b5 GEODE-9980: Improve error handling of serial filters (#7355) The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...ctionedSerializablesServiceIntegrationTest.java | 2 +- .../RedisSanctionedSerializablesService.java | 2 +- ...lization.filter.SanctionedSerializablesService} | 0 ...alization.filter.SanctionedSerializablesService | 2 +- ...artLocatorGlobalSerialFilterAcceptanceTest.java | 138 ...StartLocatorJmxSerialFilterAcceptanceTest.java} | 58 ++-- ...tartServerGlobalSerialFilterAcceptanceTest.java | 150 + .../StartServerJmxSerialFilterAcceptanceTest.java} | 55 ++-- geode-common/build.gradle | 5 +- .../apache/geode/internal/lang/SystemProperty.java | 118 +++ .../geode/internal/lang/utils}/ClassUtils.java | 3 +- .../geode/internal/lang/SystemPropertyTest.java| 107 +++ .../geode/internal/lang/utils/ClassUtilsTest.java | 8 +- ...ctionedSerializablesServiceIntegrationTest.java | 2 +- .../ConnectorsSanctionedSerializablesService.java | 2 +- ...lization.filter.SanctionedSerializablesService} | 0 geode-core/build.gradle| 4 +- ...ValidateSerializableObjectsDistributedTest.java | 320 +++ ...okenSerializationConsistencyRegressionTest.java | 6 +- ...entDeserializationCopyOnReadRegressionTest.java | 7 +- .../cache/CompactOfflineDiskStoreDUnitTest.java| 5 +- .../internal/cache/DeltaPropagationDUnitTest.java | 2 +- .../cache/ParallelDiskStoreRecoveryDUnitTest.java | 5 +- .../cache/PartitionedRegionSingleHopDUnitTest.java | 2 +- .../cache/ValidateOfflineDiskStoreDUnitTest.java | 5 +- .../RebalanceOperationComplexDistributedTest.java | 4 +- .../cache/ha/HARQueueNewImplDUnitTest.java | 5 +- .../ha/HARegionQueueExpiryRegressionTest.java | 5 +- .../HARegionQueueThreadIdExpiryRegressionTest.java | 8 +- .../sockets/RedundancyLevelPart1DUnitTest.java | 2 +- .../geode/distributed/LocatorIntegrationTest.java | 180 ++- ...catorLauncherJmxManagerLocalRegressionTest.java | 22 +- ...ctionedSerializablesServiceIntegrationTest.java | 2 +- .../internal/cache/ha/HARegionQueueJUnitTest.java | 4 +- .../DefaultDiskDirsIntegrationTest.java| 4 +- ...cherGlobalSerialFilterBlankIntegrationTest.java | 55 ...herGlobalSerialFilterExistsIntegrationTest.java | 55 ...rLauncherGlobalSerialFilterIntegrationTest.java | 52 +++ ...alSerialFilterPropertyBlankIntegrationTest.java | 54 ...alSerialFilterPropertyEmptyIntegrationTest.java | 54 ...atorLauncherJmxSerialFilterIntegrationTest.java | 84 + ...mxSerialFilterPropertyBlankIntegrationTest.java | 88 ++ ...mxSerialFilterPropertyEmptyIntegrationTest.java | 88 ++ ...xSerialFilterPropertyExistsIntegrationTest.java | 90 ++ .../filter/LocatorLauncherWithJmxManager.java | 82 + .../filter/SerialFilterAssertions.java | 58 ...cherGlobalSerialFilterBlankIntegrationTest.java | 55 ...herGlobalSerialFilterExistsIntegrationTest.java | 55 ...rLauncherGlobalSerialFilterIntegrationTest.java | 51 +++ ...alSerialFilterPropertyBlankIntegrationTest.java | 53 ...alSerialFilterPropertyEmptyIntegrationTest.java | 53 ...rverLauncherJmxSerialFilterIntegrationTest.java | 87 + ...mxSerialFilterPropertyBlankIntegrationTest.java | 88 ++ ...mxSerialFilterPropertyEmptyIntegrationTest.java | 88 ++ ...xSerialFilterPropertyExistsIntegrationTest.java | 90 ++ .../filter/ServerLauncherWithJmxManager.java | 77 + ...erConfiguresJmxSerialFilterIntegrationTest.java | 204 .../internal/ManagementAgentIntegrationTest.java | 6 +- ...erConfiguresJmxSerialFilterIntegrationTest.java | 201 .../apache/geode/distributed/AbstractLauncher.java | 2 +- .../apache/geode/distributed/LocatorLauncher.java | 20 ++ .../apache/geode/distributed/ServerLauncher.java | 19 ++ .../distributed/internal/DistributionConfig.java | 4 +- .../CoreSanctionedSerializablesService.java| 2 +- .../DistributedSerializableObjectConfig.java | 51 +++ .../geode/internal/InternalDataSerializer.ja
[geode] branch support/1.13 updated: CI: fix registry-image mirror syntax
This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a commit to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/support/1.13 by this push: new ef2d5b9 CI: fix registry-image mirror syntax ef2d5b9 is described below commit ef2d5b96787c5c02d5582b75ee403a5b9ffe93d1 Author: Robert Houghton AuthorDate: Tue Mar 22 16:19:13 2022 -0700 CI: fix registry-image mirror syntax --- ci/pipelines/pull-request/jinja.template.yml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/pipelines/pull-request/jinja.template.yml b/ci/pipelines/pull-request/jinja.template.yml index 39a19a0..33541c6 100644 --- a/ci/pipelines/pull-request/jinja.template.yml +++ b/ci/pipelines/pull-request/jinja.template.yml @@ -73,12 +73,14 @@ resource_types: - name: gci type: registry-image source: -registry_mirror: mirror.gcr.io +registry_mirror: + host: mirror.gcr.io repository: smgoller/gci-resource - name: gcs-resource type: registry-image source: -registry_mirror: mirror.gcr.io +registry_mirror: + host: mirror.gcr.io repository: frodenas/gcs-resource - name: pull-request type: docker-image
[geode] branch support/1.12 updated: fix jinja template difference from cherry-pick
This is an automated email from the ASF dual-hosted git repository.
rhoughton pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 60e9dde fix jinja template difference from cherry-pick
60e9dde is described below
commit 60e9dde40eb079b919226e2228fef36bc0d576c3
Author: Robert Houghton
AuthorDate: Tue Mar 22 16:08:42 2022 -0700
fix jinja template difference from cherry-pick
(cherry picked from commit df1d996917582fe92a84d5a5d2f12c322907c5dc)
---
ci/pipelines/pull-request/jinja.template.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index cc8c506..a263cfd 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -141,7 +141,7 @@ jobs:
- name: geode-ci
- name: attempts-log
path: old
-- name: {{ test.PLATFORM}}-builder-image-family
+- name: {{ build_test.PLATFORM}}-builder-image-family
path: builder-image
outputs:
- name: instance-data
[geode] branch support/1.13 updated: fix jinja template difference from cherry-pick
This is an automated email from the ASF dual-hosted git repository.
rhoughton pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new df1d996 fix jinja template difference from cherry-pick
df1d996 is described below
commit df1d996917582fe92a84d5a5d2f12c322907c5dc
Author: Robert Houghton
AuthorDate: Tue Mar 22 16:08:42 2022 -0700
fix jinja template difference from cherry-pick
---
ci/pipelines/pull-request/jinja.template.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index 0567af5..39a19a0 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -146,7 +146,7 @@ jobs:
- name: geode-ci
- name: attempts-log
path: old
-- name: {{ test.PLATFORM}}-builder-image-family
+- name: {{ build_test.PLATFORM}}-builder-image-family
path: builder-image
outputs:
- name: instance-data
[geode] branch support/1.12 updated: Enable PR pipeline for support/1.12
This is an automated email from the ASF dual-hosted git repository.
rhoughton pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new e4a1eca Enable PR pipeline for support/1.12
e4a1eca is described below
commit e4a1ecab855b66e93cd3f36fdf7f28243580426d
Author: Robert Houghton
AuthorDate: Tue Mar 22 14:53:53 2022 -0700
Enable PR pipeline for support/1.12
(cherry picked from commit 05e7ba28948e4b73739e45fd4db2a2f40335120f)
(cherry picked from commit 257eeb8d9a1ed56d17477afd26bfe8d8dccd5bf9)
---
ci/pipelines/pull-request/jinja.template.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index 138476b..cc8c506 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -35,6 +35,7 @@ resources:
repository: {{repository.fork}}/geode
disable_ci_skip: false
skip_ssl_verification: false
+base_branch: {{repository.branch}}
- name: geode-status
type: pull-request
source:
@@ -45,11 +46,11 @@ resources:
- name: geode-ci
type: git
source:
-branch: develop
+branch: {{repository.branch}}
depth: 1
paths:
- ci/*
-uri: https://github.com/apache/geode.git
+uri: https://github.com/{{repository.upstream_fork}}/geode.git
- name: concourse-metadata-resource
type: concourse-metadata-resource
source: {}
[geode] branch support/1.13 updated: Enable PR pipeline for support/1.13
This is an automated email from the ASF dual-hosted git repository.
rhoughton pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 257eeb8 Enable PR pipeline for support/1.13
257eeb8 is described below
commit 257eeb8d9a1ed56d17477afd26bfe8d8dccd5bf9
Author: Robert Houghton
AuthorDate: Tue Mar 22 14:53:53 2022 -0700
Enable PR pipeline for support/1.13
(cherry picked from commit 05e7ba28948e4b73739e45fd4db2a2f40335120f)
---
ci/pipelines/pull-request/jinja.template.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index 0025d36..0567af5 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -35,6 +35,7 @@ resources:
repository: {{repository.fork}}/geode
disable_ci_skip: false
skip_ssl_verification: false
+base_branch: {{repository.branch}}
- name: geode-status
type: pull-request
source:
@@ -45,11 +46,11 @@ resources:
- name: geode-ci
type: git
source:
-branch: develop
+branch: {{repository.branch}}
depth: 1
paths:
- ci/*
-uri: https://github.com/apache/geode.git
+uri: https://github.com/{{repository.upstream_fork}}/geode.git
- name: concourse-metadata-resource
type: concourse-metadata-resource
source: {}
[geode] branch support/1.14 updated (d271f78 -> 05e7ba2)
This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a change to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git. from d271f78 GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466) add 05e7ba2 Enable PR pipeline for support/1.14 No new revisions were added by this update. Summary of changes: ci/pipelines/pull-request/jinja.template.yml | 2 ++ 1 file changed, 2 insertions(+)
[geode] branch develop updated (08617a2 -> d5e3663)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 08617a2 Revert "GEODE-10097: Avoid Thread.sleep for reauthentication in MessageDispatcher (#7416)" (#7470) add d5e3663 GEODE-10149: Don't reset custom radish baseline on a patch release (#7472) No new revisions were added by this update. Summary of changes: ci/pipelines/shared/jinja.variables.yml | 4 ++-- dev-tools/release/promote_rc.sh | 14 +++--- 2 files changed, 13 insertions(+), 5 deletions(-)
[geode] branch develop updated (b3e2618 -> 08617a2)
This is an automated email from the ASF dual-hosted git repository. jinmeiliao pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from b3e2618 GEODE-10101: Replace 1.14.3 with 1.14.4 as old version (#7460) add 08617a2 Revert "GEODE-10097: Avoid Thread.sleep for reauthentication in MessageDispatcher (#7416)" (#7470) No new revisions were added by this update. Summary of changes: .../geode/security/AuthExpirationDUnitTest.java| 9 +--- .../cache/tier/sockets/CacheClientProxy.java | 7 --- .../cache/tier/sockets/MessageDispatcher.java | 57 -- .../cache/tier/sockets/ServerConnection.java | 1 - .../cache/tier/sockets/MessageDispatcherTest.java | 8 +-- .../geode/security/ExpirableSecurityManager.java | 8 +-- .../sanctioned-geode-junit-serializables.txt | 2 +- 7 files changed, 28 insertions(+), 64 deletions(-)
[geode] branch develop updated (f4d173b -> b3e2618)
This is an automated email from the ASF dual-hosted git repository. dixie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f4d173b GEODE-10123: Improve "create region" checks (#7443) add b3e2618 GEODE-10101: Replace 1.14.3 with 1.14.4 as old version (#7460) No new revisions were added by this update. Summary of changes: ci/pipelines/shared/jinja.variables.yml | 6 +++--- settings.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
[geode] branch support/1.13 updated: GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466)
This is an automated email from the ASF dual-hosted git repository. dixie pushed a commit to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 5e09c5a GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466) 5e09c5a is described below commit 5e09c5ab15ca82ee078889385ae2a81af341d5f9 Author: Robert Houghton AuthorDate: Mon Mar 21 15:39:03 2022 -0700 GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466) Also add concourse resources to track our base-image versions to better track which dependencies may have caused the build issue. Still only triggering on the core base image, and our Dockerfile. Authored-by: Robert Houghton (cherry picked from commit 07a1aacc9275e028b0ab8dd57193f423f8f722c3) --- ci/images/alpine-tools/Dockerfile | 19 +- ci/pipelines/images/jinja.template.yml | 35 -- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/ci/images/alpine-tools/Dockerfile b/ci/images/alpine-tools/Dockerfile index f476e0e..f37181f 100644 --- a/ci/images/alpine-tools/Dockerfile +++ b/ci/images/alpine-tools/Dockerfile @@ -14,36 +14,45 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM bellsoft/liberica-openjdk-alpine:8 as winrm-builder +FROM alpine:3.14 as winrm-builder RUN apk --no-cache add \ git \ go \ musl-dev \ && go get -v github.com/masterzen/winrm-cli -FROM bellsoft/liberica-openjdk-alpine:8 +FROM google/cloud-sdk:alpine COPY --from=winrm-builder /root/go/bin/winrm-cli /usr/local/bin/winrm -COPY --from=google/cloud-sdk:alpine /google-cloud-sdk /google-cloud-sdk #COPY --from=hashicorp/packer:latest /bin/packer /usr/local/bin/packer COPY --from=hashicorp/packer:1.4.5 /bin/packer /usr/local/bin/packer -ENV PATH /google-cloud-sdk/bin:$PATH + RUN apk --no-cache add \ bash \ curl \ git \ jq \ - musl-dev \ openssh-client \ openssl \ python3 \ + py3-crcmod \ + py3-openssl \ py3-pip \ py3-yaml \ rsync \ util-linux \ + wget \ + && echo "https://apk.bell-sw.com/main"; | tee -a /etc/apk/repositories \ + && wget -P /etc/apk/keys/ https://apk.bell-sw.com/i...@bell-sw.com-5fea454e.rsa.pub \ + && apk add --no-cache \ +bellsoft-java8 \ + && apk del \ + wget \ && gcloud config set core/disable_usage_reporting true \ && gcloud config set component_manager/disable_update_check true \ && gcloud config set metrics/environment github_docker_image \ && gcloud components install -q beta \ && printf "Host *\n ServerAliveInterval 60 \n ServerAliveCountMax 2\n" >> /etc/ssh/ssh_config \ && pip3 install awscli + +ENV JAVA_HOME /usr/lib/jvm/default-jvm diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml index 9b3ee7f..3afdf12 100644 --- a/ci/pipelines/images/jinja.template.yml +++ b/ci/pipelines/images/jinja.template.yml @@ -65,6 +65,34 @@ resources: repository: bellsoft/liberica-openjdk-debian tag: 8 +- name: packer-145-image + icon: docker + type: registry-image + source: +registry_mirror: + host: mirror.gcr.io +repository: hashicorp/packer +tag: 1.4.5 + +- name: gcloud-sdk-image + icon: docker + type: registry-image + source: +registry_mirror: + host: mirror.gcr.io +repository: google/cloud-sdk +tag: alpine + +# Base image for full-regression-runner +- name: alpine-314-image + icon: docker + type: registry-image + source: +registry_mirror: + host: mirror.gcr.io +repository: alpine +tag: 3.14 + - name: google-geode-builder type: git source: @@ -325,10 +353,13 @@ jobs: serial: true plan: - in_parallel: -- get: alpine-docker-image - trigger: true - get: alpine-tools-dockerfile trigger: true +# Base images, used for tracking +- get: gcloud-sdk-image + trigger: true +- get: packer-145-image +- get: alpine-314-image - put: alpine-tools-docker-image params: build: alpine-tools-dockerfile/ci/images/alpine-tools
[geode] branch support/1.14 updated: GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466)
This is an automated email from the ASF dual-hosted git repository. dixie pushed a commit to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/support/1.14 by this push: new d271f78 GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466) d271f78 is described below commit d271f7825e42173f2cd77a9b165ddecd06a9547f Author: Robert Houghton AuthorDate: Mon Mar 21 15:39:03 2022 -0700 GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466) Also add concourse resources to track our base-image versions to better track which dependencies may have caused the build issue. Still only triggering on the core base image, and our Dockerfile. Authored-by: Robert Houghton (cherry picked from commit 07a1aacc9275e028b0ab8dd57193f423f8f722c3) --- ci/images/alpine-tools/Dockerfile | 19 +- ci/pipelines/images/jinja.template.yml | 35 -- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/ci/images/alpine-tools/Dockerfile b/ci/images/alpine-tools/Dockerfile index f476e0e..f37181f 100644 --- a/ci/images/alpine-tools/Dockerfile +++ b/ci/images/alpine-tools/Dockerfile @@ -14,36 +14,45 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM bellsoft/liberica-openjdk-alpine:8 as winrm-builder +FROM alpine:3.14 as winrm-builder RUN apk --no-cache add \ git \ go \ musl-dev \ && go get -v github.com/masterzen/winrm-cli -FROM bellsoft/liberica-openjdk-alpine:8 +FROM google/cloud-sdk:alpine COPY --from=winrm-builder /root/go/bin/winrm-cli /usr/local/bin/winrm -COPY --from=google/cloud-sdk:alpine /google-cloud-sdk /google-cloud-sdk #COPY --from=hashicorp/packer:latest /bin/packer /usr/local/bin/packer COPY --from=hashicorp/packer:1.4.5 /bin/packer /usr/local/bin/packer -ENV PATH /google-cloud-sdk/bin:$PATH + RUN apk --no-cache add \ bash \ curl \ git \ jq \ - musl-dev \ openssh-client \ openssl \ python3 \ + py3-crcmod \ + py3-openssl \ py3-pip \ py3-yaml \ rsync \ util-linux \ + wget \ + && echo "https://apk.bell-sw.com/main"; | tee -a /etc/apk/repositories \ + && wget -P /etc/apk/keys/ https://apk.bell-sw.com/i...@bell-sw.com-5fea454e.rsa.pub \ + && apk add --no-cache \ +bellsoft-java8 \ + && apk del \ + wget \ && gcloud config set core/disable_usage_reporting true \ && gcloud config set component_manager/disable_update_check true \ && gcloud config set metrics/environment github_docker_image \ && gcloud components install -q beta \ && printf "Host *\n ServerAliveInterval 60 \n ServerAliveCountMax 2\n" >> /etc/ssh/ssh_config \ && pip3 install awscli + +ENV JAVA_HOME /usr/lib/jvm/default-jvm diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml index 3c202d2..05c354f 100644 --- a/ci/pipelines/images/jinja.template.yml +++ b/ci/pipelines/images/jinja.template.yml @@ -73,6 +73,34 @@ resources: - infrastructure/scripts/aws/image uri: https://github.com/((geode-fork))/geode-benchmarks.git +- name: packer-145-image + icon: docker + type: registry-image + source: +registry_mirror: + host: mirror.gcr.io +repository: hashicorp/packer +tag: 1.4.5 + +- name: gcloud-sdk-image + icon: docker + type: registry-image + source: +registry_mirror: + host: mirror.gcr.io +repository: google/cloud-sdk +tag: alpine + +# Base image for full-regression-runner +- name: alpine-314-image + icon: docker + type: registry-image + source: +registry_mirror: + host: mirror.gcr.io +repository: alpine +tag: 3.14 + - name: google-geode-builder type: git source: @@ -366,10 +394,13 @@ jobs: serial: true plan: - in_parallel: -- get: alpine-docker-image - trigger: true - get: alpine-tools-dockerfile trigger: true +# Base images, used for tracking +- get: gcloud-sdk-image + trigger: true +- get: packer-145-image +- get: alpine-314-image - put: alpine-tools-docker-image params: build: alpine-tools-dockerfile/ci/images/alpine-tools
[geode] branch develop updated (07a1aac -> f4d173b)
This is an automated email from the ASF dual-hosted git repository. mkevo pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 07a1aac GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466) add f4d173b GEODE-10123: Improve "create region" checks (#7443) No new revisions were added by this update. Summary of changes: .../cli/commands/CreateRegionCommandDUnitTest.java | 10 +-- .../commands/CreateRegionSecurityDUnitTest.java| 2 +- .../internal/cli/commands/CreateRegionCommand.java | 86 ++ 3 files changed, 92 insertions(+), 6 deletions(-)
