You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ig...@apache.org on 2020/04/03 07:50:55 UTC

[geode] branch mass-test-run updated (876946e -> ccedf05)

This is an automated email from the ASF dual-hosted git repository.

igodwin pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 876946e  remove meta-* jobs that we won't use for mass-test-run
 discard c989dde  Mass-test-run branch, no windows or publication jobs
     add 2c26de8  GEODE-7916: use updated gradle plugin declarations (#4856)
     add 80ffe65  GEODE-7915: rc pipeline fixes and improvements (#4853)
     add 472e2e7  GEODE-7918: Add assertion message to DNS resolution assertions. (#4859)
     add 10c98e0  GEODE-7864: Removed unused logConfigListeners in InternalLocator (#4863)
     add 91addf9  GEODE-7864: Removed unused Arraylist vals in TestFunction (#4864)
     add 43162fa  GEODE-7864: Instance checks in equals methods (#4865)
     add 74e469a  GEODE-7864: Removed printStackTrace command. (#4868)
     add 475ac93  GEODE-7864: Remove boxed variable as it can never be null. (#4869)
     add 147d066  GEODE-7864: Prevent queryMonitor to be visible before all the statements are executed. (#4875)
     add a8527c5  GEODE-7864: Fixed javadocs params (#4877)
     add ddf8f13  GEODE-7864: Fixed queries with missing space. (#4878)
     add e10cf65  GEODE-7852: Move sni test files to a test specific dir
     add 4984ed9  GEODE-7851: use the latest version of nimbus-jose-jwt.jar (#4851)
     add fb2c273  GEODE-7914: create missing unit test for Redis Module Expire Command (#4852)
     add 2cf9925  GEODE-7864: Print contents of arrays correctly. (#4879)
     add 4966e50  GEODE-7919: Moving membership integration test to geode-membership (#4862)
     add b021b12  Feature/geode 6536 2: Added retry in borrowConnection/single hop (#4833)
     add 6df49de  GEODE-7864: Prevent overflow during multiplication. (#4876)
     add 17e1d12  GEODE-7897: Run Redis integration tests against native Redis via Docker (#4834)
     add 0320dc1  GEODE-7905, GEODE-7870: Ignore flaky tests while they are being worked on (#4887)
     add 232cfa1  GEODE-7923: update release scripts to handle support branches (#4874)
     add faece9a  GEODE-7927: create tests to ensure feature-parity with Redis PEXPIRE command (#4886)
     add be70be9  GEODE-7937: fix Tomcat8ClientServerRollingUpgradeTest to get product version correctly (#4889)
     add 36efe4d  add 1.12.0 to old versions (#4888)
     add 9036ab9  GEODE-7925: Add concurrency test to PubSubDUnitTest (#4884)
     add 0cb54ca  GEODE-7938: change dev rest api to support slashes in key parameters (#4885)
     add ef0f81f  GEODE-7942: document enable-management-rest-service (#4897)
     add 6fffd5c  GEODE-7941: update Shiro to recommended version 1.5.2 (#4896)
     add ba1916b  GEODE-7156: add docs for security-auth-token-enabled-components (#4895)
     add ef6fdc1  GEODE-7919-fix-flaky: add Awaitility to soak up latency (#4891)
     add c5c0b0b  Revert "GEODE-7710: Fix race condition in federation of MXBeans (#4807)" (#4832)
     add 3e2d501  GEODE-6819: Fix PartitionedRegionSingleHopDUnitTest BindExceptions
     new 2a828ad  Mass-test-run branch, no windows or publication jobs
     new ccedf05  remove meta-* jobs that we won't use for mass-test-run

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (876946e)
            \
             N -- N -- N   refs/heads/mass-test-run (ccedf05)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 2 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:
 .../src/test/resources/expected-pom.xml            |   90 +-
 build.gradle                                       |   44 +-
 .../gradle/plugins/DependencyConstraints.groovy    |   19 +-
 ci/pipelines/meta/deploy_meta.sh                   |    4 +-
 dev-tools/release/README.md                        |   15 +-
 dev-tools/release/commit_rc.sh                     |    6 +-
 dev-tools/release/create_support_branches.sh       |  220 +++
 dev-tools/release/deploy_rc_pipeline.sh            |  144 +-
 dev-tools/release/end_of_support.sh                |  128 ++
 dev-tools/release/finalize_release.sh              |  203 ---
 dev-tools/release/prepare_rc.sh                    |   39 +-
 dev-tools/release/print_rc_email.sh                |    6 +-
 dev-tools/release/promote_rc.sh                    |  210 ++-
 dev-tools/release/set_versions.sh                  |  155 ++
 .../geode/modules/session/CommandServlet.java      |    1 -
 geode-assembly/build.gradle                        |    8 +-
 .../client/{ => sni}/ClientSNIAcceptanceTest.java  |    7 +-
 .../geode/client/{ => sni}/docker-compose.yml      |    0
 .../{ => sni}/geode-config/gemfire.properties      |    0
 .../{ => sni}/geode-config/gfsecurity.properties   |    0
 .../{ => sni}/geode-config/locator-keystore.jks    |  Bin
 .../{ => sni}/geode-config/server-keystore.jks     |  Bin
 .../client/{ => sni}/geode-config/truststore.jks   |  Bin
 .../org/apache/geode/client/{ => sni}/haproxy.cfg  |    0
 .../apache/geode/client/{ => sni}/scripts/forever  |    0
 .../client/{ => sni}/scripts/geode-starter.gfsh    |    0
 .../integrationTest/resources/assembly_content.txt |   18 +-
 .../resources/dependency_classpath.txt             |   18 +-
 .../Tomcat8ClientServerRollingUpgradeTest.java     |    8 +-
 .../apache/geode/cache30/CacheXml66DUnitTest.java  |    5 +-
 .../cache/PartitionedRegionSingleHopDUnitTest.java | 1592 +++++++++-----------
 .../cache/tier/sockets/AcceptorImplDUnitTest.java  |    1 +
 .../management/JMXMBeanReconnectDUnitTest.java     |   36 +-
 .../cache/ConnectionPoolFactoryJUnitTest.java      |   16 +
 .../AutoConnectionSourceImplJUnitTest.java         |    5 +
 .../internal/ConnectionPoolImplJUnitTest.java      |   24 +
 .../client/internal/QueueManagerJUnitTest.java     |    5 +
 .../pooling/ConnectionManagerImplTest.java         |   45 +-
 .../pooling/ConnectionManagerJUnitTest.java        |  129 +-
 .../membership/gms/MembershipOnlyTest.java         |  152 --
 .../codeAnalysis/sanctionedDataSerializables.txt   |    6 +-
 .../org/apache/geode/cache/EvictionAttributes.java |    6 +-
 .../geode/cache/client/ClientCacheFactory.java     |   20 +
 .../java/org/apache/geode/cache/client/Pool.java   |    7 +
 .../org/apache/geode/cache/client/PoolFactory.java |   27 +
 .../cache/client/internal/InternalClientCache.java |    2 +
 .../cache/client/internal/OpExecutorImpl.java      |    7 +-
 .../geode/cache/client/internal/PoolImpl.java      |   22 +-
 .../client/internal/pooling/ConnectionManager.java |    5 +-
 .../internal/pooling/ConnectionManagerImpl.java    |   61 +-
 .../apache/geode/cache/configuration/PoolType.java |   25 +
 .../distributed/internal/InternalLocator.java      |   10 +-
 .../apache/geode/internal/cache/DiskStoreImpl.java |    2 +-
 .../geode/internal/cache/GemFireCacheImpl.java     |   10 +-
 .../geode/internal/cache/PoolFactoryImpl.java      |   23 +-
 .../execute/ServerRegionFunctionExecutor.java      |    2 +-
 .../geode/internal/cache/ha/HARegionQueue.java     |    2 +-
 .../tier/sockets/ClientDataSerializerMessage.java  |    2 +-
 .../tier/sockets/ClientInstantiatorMessage.java    |    2 +-
 .../geode/internal/cache/util/UncheckedUtils.java  |    6 +
 .../geode/internal/cache/xmlcache/CacheXml.java    |    1 +
 .../internal/cache/xmlcache/CacheXmlGenerator.java |    4 +
 .../internal/cache/xmlcache/CacheXmlParser.java    |    4 +
 .../management/internal/FederatingManager.java     |    3 +
 .../internal/ManagementCacheListener.java          |   39 +-
 .../internal/NotificationCacheListener.java        |   90 +-
 .../geode.apache.org/schema/cache/cache-1.0.xsd    |    1 +
 .../schema.pivotal.io/gemfire/cache/cache-8.1.xsd  |    1 +
 .../org/apache/geode/cache/doc-files/cache7_0.dtd  |    1 +
 .../org/apache/geode/cache/doc-files/cache8_0.dtd  |    1 +
 .../sanctioned-geode-core-serializables.txt        |    2 +-
 .../client/internal/OpExecutorImplJUnitTest.java   |   25 +-
 .../cache/client/internal/TXFailoverOpTest.java    |    2 +
 .../internal/ManagementCacheListenerTest.java      |  159 --
 .../internal/NotificationCacheListenerTest.java    |   70 -
 .../running/cluster-management-service.html.md.erb |   16 +
 geode-docs/reference/topics/cache_xml.html.md.erb  |    7 +-
 .../reference/topics/client-cache.html.md.erb      |    7 +-
 .../topics/gemfire_properties.html.md.erb          |   27 +-
 .../apache/geode/cache/query/QueryTestUtils.java   |   56 +-
 .../apache/geode/cache/query/dunit/TestObject.java |    3 +
 .../internal/cache/functions/TestFunction.java     |   10 +-
 .../cache/tier/sockets/CacheServerTestUtil.java    |    1 +
 .../internal/cli/result/model/ResultModel.java     |    4 +-
 .../cache/PartitionedRegionTestHelper.java         |    3 +
 .../geode/security/query/data/QueryTestObject.java |    3 +
 .../serializable/SerializableTemporaryFolder.java  |    2 +-
 .../membership/gms/MembershipIntegrationTest.java  |  255 ++++
 geode-redis/build.gradle                           |    8 +-
 .../geode/redis/GeoDockerAcceptanceTest.java       |   85 ++
 .../geode/redis/HashesDockerAcceptanceTest.java    |   52 +
 .../geode/redis/ListsDockerAcceptanceTest.java     |   48 +
 .../geode/redis/PubSubDockerAcceptanceTest.java    |   58 +
 .../geode/redis/RenameDockerAcceptanceTest.java    |   66 +
 .../geode/redis/SetsDockerAcceptanceTest.java      |   50 +
 .../redis/SortedSetsDockerAcceptanceTest.java      |   47 +
 .../geode/redis/StringsDockerAcceptanceTest.java   |   63 +
 .../org/apache/geode/redis/PubSubDUnitTest.java    |   80 +-
 .../org/apache/geode/redis/RedisDistDUnitTest.java |    2 +
 .../org/apache/geode/redis/GeoIntegrationTest.java |   53 +-
 .../apache/geode/redis/HashesIntegrationTest.java  |   36 +-
 .../apache/geode/redis/ListsIntegrationTest.java   |    6 +-
 .../apache/geode/redis/PubSubIntegrationTest.java  |   16 +-
 ...{RenameTest.java => RenameIntegrationTest.java} |   95 +-
 .../SetCommandNegativeCaseIntegrationTest.java     |   90 --
 .../apache/geode/redis/SetsIntegrationTest.java    |   14 +-
 .../geode/redis/SortedSetsIntegrationTest.java     |    5 +-
 .../apache/geode/redis/StringsIntegrationTest.java |   28 +-
 .../geode/redis/general/ExpireIntegrationTest.java |    6 +-
 .../redis/general/PexpireIntegrationTest.java      |   66 +
 .../org/apache/geode/redis/internal/Coder.java     |    6 +-
 .../geode/redis/internal/RedisConstants.java       |    3 +
 .../redis/internal/executor/ExpireExecutor.java    |    3 +-
 .../redis/internal/executor/RenameExecutor.java    |    3 +-
 .../internal/executor/string/IncrExecutor.java     |    8 +-
 .../geode/redis/internal/GeoCoderJUnitTest.java}   |   12 +-
 .../executor/general/ExpireExecutorJUnitTest.java  |  114 ++
 .../executor/general/PexpireExecutorJUnitTest.java |   20 +-
 .../internal/tcpserver/HostAndPortTest.java        |    8 +-
 .../internal/tcpserver/TcpServerJUnitTest.java     |    4 +-
 .../web/controllers/RestAccessControllerTest.java  |  125 +-
 .../web/controllers/AbstractBaseController.java    |   14 +
 .../web/controllers/CommonCrudController.java      |   12 +-
 .../web/controllers/PdxBasedCrudController.java    |   30 +-
 gradle/standard-subproject-configuration.gradle    |    4 +-
 settings.gradle                                    |    3 +-
 126 files changed, 3626 insertions(+), 2114 deletions(-)
 create mode 100755 dev-tools/release/create_support_branches.sh
 create mode 100755 dev-tools/release/end_of_support.sh
 delete mode 100755 dev-tools/release/finalize_release.sh
 create mode 100755 dev-tools/release/set_versions.sh
 rename geode-assembly/src/acceptanceTest/java/org/apache/geode/client/{ => sni}/ClientSNIAcceptanceTest.java (97%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/docker-compose.yml (100%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/geode-config/gemfire.properties (100%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/geode-config/gfsecurity.properties (100%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/geode-config/locator-keystore.jks (100%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/geode-config/server-keystore.jks (100%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/geode-config/truststore.jks (100%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/haproxy.cfg (100%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/scripts/forever (100%)
 rename geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/{ => sni}/scripts/geode-starter.gfsh (100%)
 delete mode 100644 geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipOnlyTest.java
 delete mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/ManagementCacheListenerTest.java
 delete mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/NotificationCacheListenerTest.java
 create mode 100644 geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipIntegrationTest.java
 create mode 100755 geode-redis/src/acceptanceTest/java/org/apache/geode/redis/GeoDockerAcceptanceTest.java
 create mode 100755 geode-redis/src/acceptanceTest/java/org/apache/geode/redis/HashesDockerAcceptanceTest.java
 create mode 100755 geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ListsDockerAcceptanceTest.java
 create mode 100644 geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PubSubDockerAcceptanceTest.java
 create mode 100644 geode-redis/src/acceptanceTest/java/org/apache/geode/redis/RenameDockerAcceptanceTest.java
 create mode 100755 geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SetsDockerAcceptanceTest.java
 create mode 100755 geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SortedSetsDockerAcceptanceTest.java
 create mode 100755 geode-redis/src/acceptanceTest/java/org/apache/geode/redis/StringsDockerAcceptanceTest.java
 rename geode-redis/src/integrationTest/java/org/apache/geode/redis/{RenameTest.java => RenameIntegrationTest.java} (66%)
 delete mode 100644 geode-redis/src/integrationTest/java/org/apache/geode/redis/SetCommandNegativeCaseIntegrationTest.java
 create mode 100644 geode-redis/src/integrationTest/java/org/apache/geode/redis/general/PexpireIntegrationTest.java
 rename geode-redis/src/{integrationTest/java/org/apache/geode/redis/GeoCoderIntegrationTest.java => test/java/org/apache/geode/redis/internal/GeoCoderJUnitTest.java} (81%)
 mode change 100755 => 100644
 create mode 100644 geode-redis/src/test/java/org/apache/geode/redis/internal/executor/general/ExpireExecutorJUnitTest.java
 copy geode-core/src/main/java/org/apache/geode/internal/cache/util/UncheckedUtils.java => geode-redis/src/test/java/org/apache/geode/redis/internal/executor/general/PexpireExecutorJUnitTest.java (59%)


[geode] 01/02: Mass-test-run branch, no windows or publication jobs

Posted by ig...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

igodwin pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 2a828ad53dc8f07c576c4b91ea8da7cc966ad279
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Mon Jan 27 15:20:46 2020 -0800

    Mass-test-run branch, no windows or publication jobs
    
    Co-authored-by: Robert Houghton <rh...@pivotal.io>
    Co-authored-by: Mark Hanson <mh...@pivotal.io>
---
 ci/pipelines/geode-build/jinja.template.yml | 310 +---------------------------
 ci/pipelines/shared/jinja.variables.yml     |  77 +------
 2 files changed, 9 insertions(+), 378 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index da6e399..f9dcbda 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -92,66 +92,6 @@ GRADLE_GLOBAL_ARGS: ((gradle-global-args))
   {%- endfor -%}
 {% endmacro %}
 
-groups:
-- name: main
-  jobs:
-  - {{ build_test.name }}
-  {{- all_gating_jobs() | indent(2) }}
-  - UpdatePassingTokens
-  {%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
-  - PublishArtifacts
-  {%- endif %}
-  {%- for flavor in (benchmarks.flavors) %}
-  - Benchmark{{flavor.title}}
-  {%- endfor %}
-- name: complete
-  jobs:
-  - {{ build_test.name }}
-  {%- for test in (tests) if not test.name=="StressNew" -%}
-    {%- for java_test_version in (java_test_versions) %}
-  - {{test.name}}Test{{java_test_version.name}}
-    {%- endfor -%}
-  {%- endfor %}
-  - UpdatePassingTokens
-  {%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
-  - PublishArtifacts
-  {%- endif %}
-  {%- for flavor in (benchmarks.flavors) %}
-  - Benchmark{{flavor.title}}
-  {%- endfor %}
-- name: linux
-  jobs:
-  - {{ build_test.name }}
-  {%- for test in (tests) if test.PLATFORM=="linux" and not test.name=="StressNew" -%}
-    {% for java_test_version in (java_test_versions) %}
-  - {{test.name}}Test{{java_test_version.name}}
-    {%- endfor -%}
-  {%- endfor %}
-  {%- for flavor in (benchmarks.flavors) %}
-  - Benchmark{{flavor.title}}
-  {%- endfor %}
-- name: windows
-  jobs:
-  - {{ build_test.name }}
-  {%- for test in (tests) if test.PLATFORM=="windows" -%}
-    {% for java_test_version in (java_test_versions) %}
-  - {{test.name}}Test{{java_test_version.name}}
-    {%- endfor -%}
-  {%- endfor %}
-{%- for java_test_version in (java_test_versions) %}
-- name: {{java_test_version.name}}
-  jobs:
-  - {{ build_test.name }}
-  {%- for test in (tests) if not test.name=="StressNew" %}
-  - {{test.name}}Test{{java_test_version.name}}
-  {%- endfor -%}
-{%- endfor %}
-- name: Semver Management
-  jobs:
-  {%- for semverPiece in ['major', 'minor', 'patch'] %}
-  - Bump{{ semverPiece.title() }}
-  {%- endfor %}
-
 resources:
 - name: concourse-metadata-resource
   type: concourse-metadata-resource
@@ -173,12 +113,7 @@ resources:
     paths:
     - ci/*
     {{ github_access() | indent(4) }}
-- name: geode-benchmarks
-  type: git
-  source:
-    branch: {{benchmarks.benchmark_branch}}
-    depth: 1
-    uri: https://github.com/apache/geode-benchmarks.git
+
 - name: geode-build-version
   type: semver
   source:
@@ -187,12 +122,7 @@ resources:
     initial_version: {{ metadata.initial_version }}
     json_key: ((!concourse-gcp-key))
     key: semvers/((pipeline-prefix))((geode-build-branch))/version
-- name: geode-passing-tokens
-  type: gcs-resource
-  source:
-    bucket: ((artifact-bucket))
-    json_key: ((concourse-gcp-key))
-    versioned_file: semvers/((pipeline-prefix))((geode-build-branch))/passing-build-tokens.json
+
 - name: alpine-tools-image
   type: docker-image
   source:
@@ -201,12 +131,6 @@ resources:
     repository: gcr.io/((gcp-project))/((pipeline-prefix))alpine-tools
     tag: latest
 
-- name: windows-builder-image-family
-  type: gci
-  source:
-    key: ((concourse-gcp-key))
-    family_project: ((gcp-project))
-    family: ((pipeline-prefix))windows-geode-builder
 
 - name: linux-builder-image-family
   type: gci
@@ -233,16 +157,8 @@ resource_types:
   source:
     repository: frodenas/gcs-resource
 jobs:
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-    params: { bump: {{ semverPiece }} }
-  - put: geode-build-version
-    params:
-      file: geode-build-version/number
-{% endfor %}
+
+
 - name: {{build_test.name}}
   public: true
   max_in_flight: {{build_test.MAX_IN_FLIGHT}}
@@ -388,224 +304,6 @@ jobs:
               - name: instance-data
             timeout: 1h
 
-- name: UpdatePassingTokens
-  public: true
-  serial: true
-  plan:
-  - aggregate:
-    - get: alpine-tools-image
-    - get: geode
-      passed: &update-token-passed-anchor
-{%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
-      - PublishArtifacts
-{% else %}
-      {% for flavor in (benchmarks.flavors) %}
-      - Benchmark{{flavor.title}}
-      {% endfor %}
-{% endif %}
-      trigger: true
-    - get: geode-build-version
-      trigger: true
-      passed: *update-token-passed-anchor
-  - task: couple-sha-and-build-id
-    image: alpine-tools-image
-    config:
-      platform: linux
-      inputs:
-      - name: geode
-      - name: geode-build-version
-      outputs:
-      - name: geode-passing-tokens
-      run:
-        path: bash
-        args:
-        - -cx
-        - |
-          pushd geode
-            GEODE_SHA=$(git rev-parse HEAD)
-          popd
-          GEODE_SEMVER=$(cat geode-build-version/number)
-
-          GS_PATH=gs://((artifact-bucket))/semvers/((pipeline-prefix))((geode-build-branch))/passing-build-tokens.json
-          CURRENT_PASSING_SHA=$(gsutil cat ${GS_PATH} | jq -r .ref)
-          set -e
-          # Check that the incoming GEODE_SHA is a descendent of the currently stored value.
-          # Keeps us from winding back the repository in the case of an out-of-order pipeline pass
-          if [ -z "${CURRENT_PASSING_SHA}" ] || (cd geode; git merge-base --is-ancestor ${CURRENT_PASSING_SHA} ${GEODE_SHA}); then
-            cat > geode-passing-tokens/passing-build-tokens.json <<JSON
-          {
-            "ref": "${GEODE_SHA}",
-            "semver": "${GEODE_SEMVER}"
-          }
-          JSON
-          fi
-  - aggregate:
-    - put: geode-passing-tokens
-      params:
-        file: geode-passing-tokens/passing-build-tokens.json
-
-{% for run_var in (benchmarks.flavors) %}
-- name: Benchmark{{ run_var.title }}
-  public: true
-  max_in_flight: 3
-  plan:
-  - get: geode-ci
-    passed:
-    {{ all_gating_jobs() | indent(4) }}
-  - get: alpine-tools-image
-  - aggregate:
-    - get: geode
-      passed:
-      {{ all_gating_jobs() | indent(6) }}
-      trigger: true
-    - get: geode-benchmarks
-    - get: geode-build-version
-      trigger: true
-      passed:
-      {{ all_gating_jobs() | indent(6) }}
-    - put: concourse-metadata-resource
-  - do:
-    - task: run_benchmarks{{ run_var.title }}
-      image: alpine-tools-image
-      config:
-        platform: linux
-        params:
-          AWS_ACCESS_KEY_ID: ((benchmarks-access-key-id))
-          AWS_SECRET_ACCESS_KEY: ((benchmarks-secret-access-key))
-          AWS_DEFAULT_REGION: us-west-2
-          AWS_REGION: us-west-2
-          ARTIFACT_BUCKET: ((artifact-bucket))
-          BENCHMARKS_BRANCH: {{benchmarks.benchmark_branch}}
-          BASELINE_BRANCH: {{benchmarks.baseline_branch}}
-          BASELINE_VERSION: {{benchmarks.baseline_version}}
-          FLAGS: {{ run_var.flag }}
-          TAG_POSTFIX: {{ run_var.title }}
-          TEST_OPTIONS: {{ run_var.options }}
-        run:
-          path: geode-ci/ci/scripts/run_benchmarks.sh
-        inputs:
-        - name: geode
-        - name: geode-ci
-        - name: geode-benchmarks
-        - name: concourse-metadata-resource
-        outputs:
-        - name: results
-      timeout: 8h
-      ensure:
-        do:
-        - task: cleanup_benchmarks
-          image: alpine-tools-image
-          config:
-            platform: linux
-            params:
-              AWS_ACCESS_KEY_ID: ((benchmarks-access-key-id))
-              AWS_SECRET_ACCESS_KEY: ((benchmarks-secret-access-key))
-              AWS_DEFAULT_REGION: us-west-2
-              AWS_REGION: us-west-2
-              ARTIFACT_BUCKET: ((artifact-bucket))
-              BASELINE_BRANCH: {{benchmarks.baseline_branch}}
-              BASELINE_VERSION: {{benchmarks.baseline_version}}
-              FLAGS: {{ run_var.flag }}
-              TAG_POSTFIX: {{ run_var.title }}
-              TEST_OPTIONS: {{ run_var.options }}
-            run:
-              path: geode-ci/ci/scripts/cleanup_benchmarks.sh
-            inputs:
-            - name: geode
-            - name: geode-ci
-            - name: geode-benchmarks
-            - name: concourse-metadata-resource
-            - name: results
-{% endfor %}
-{% if repository.upstream_fork != "apache" or repository.branch == "develop" %}
-- name: PublishArtifacts
-  public: true
-  plan:
-  - aggregate:
-    - get: geode-ci
-      passed: &publish-passed-inputs
-      {% for flavor in (benchmarks.flavors) %}
-      - Benchmark{{flavor.title}}
-      {% endfor %}
-    - get: alpine-tools-image
-    - get: geode
-      passed: *publish-passed-inputs
-      trigger: true
-    - get: linux-builder-image-family
-  - aggregate:
-    - get: geode-build-version
-      trigger: true
-      passed: *publish-passed-inputs
-    - put: concourse-metadata-resource
-    {{ init_retry()|indent(4) }}
-  - task: create_instance
-    image: alpine-tools-image
-    config:
-      platform: linux
-      params:
-        {{ common_instance_params(publish_artifacts) | indent(8) }}
-        GEODE_BRANCH: {{repository.branch}}
-        GEODE_FORK: {{repository.fork}}
-        JAVA_BUILD_VERSION: {{ java_build_version.version }}
-        IMAGE_FAMILY_NAME: ((pipeline-prefix))linux-geode-builder
-      run:
-        path: geode-ci/ci/scripts/create_instance.sh
-      inputs:
-      - name: concourse-metadata-resource
-      - name: geode-ci
-      - name: geode
-      - name: attempts-log
-        path: old
-      outputs:
-      - name: instance-data
-      - name: attempts-log
-        path: new
-    timeout: 20m
-    attempts: 5
-  - task: rsync_code_up
-    image: alpine-tools-image
-    config:
-      platform: linux
-      run:
-        path: geode-ci/ci/scripts/rsync_code_up.sh
-      inputs:
-      - name: geode-ci
-      - name: geode
-      - name: instance-data
-    timeout: 5m
-  - task: publish
-    image: alpine-tools-image
-    config:
-      platform: linux
-      params:
-        MAINTENANCE_VERSION: ((geode-build-branch))
-        ARTIFACT_BUCKET: ((artifact-bucket))
-        SERVICE_ACCOUNT: ((!concourse-gcp-account))
-        JAVA_BUILD_VERSION: {{ java_build_version.version }}
-        MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-        GRADLE_GLOBAL_ARGS: ((gradle-global-args))
-      run:
-        path: geode-ci/ci/scripts/execute_publish.sh
-      inputs:
-      - name: instance-data
-      - name: geode
-      - name: geode-ci
-      - name: geode-build-version
-    ensure:
-      do:
-      - task: delete_instance
-        image: alpine-tools-image
-        config:
-          platform: linux
-          run:
-            path: geode-ci/ci/scripts/delete_instance.sh
-          inputs:
-          - name: geode-ci
-          - name: instance-data
-        timeout: 1h
-
-{% endif %}
-
 {%- for test in tests if not test.name=="StressNew" %}
   {%- set parameters = {} %}
   {%- do deep_merge(parameters, test) %}
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index a82cdca..3931254 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -84,7 +84,7 @@ tests:
   DUNIT_PARALLEL_FORKS: '0'
   EXECUTE_TEST_TIMEOUT: 30m
   GRADLE_TASK: test
-  MAX_IN_FLIGHT: 1
+  MAX_IN_FLIGHT: 5
   PARALLEL_DUNIT: 'false'
   PARALLEL_GRADLE: 'true'
   PLATFORM: linux
@@ -96,7 +96,7 @@ tests:
   DUNIT_PARALLEL_FORKS: '0'
   EXECUTE_TEST_TIMEOUT: 1h30m
   GRADLE_TASK: acceptanceTest
-  MAX_IN_FLIGHT: 2
+  MAX_IN_FLIGHT: 5
   PARALLEL_DUNIT: 'false'
   PARALLEL_GRADLE: 'false'
   PLATFORM: linux
@@ -108,7 +108,7 @@ tests:
   DUNIT_PARALLEL_FORKS: '24'
   EXECUTE_TEST_TIMEOUT: 3h00m
   GRADLE_TASK: distributedTest
-  MAX_IN_FLIGHT: 3
+  MAX_IN_FLIGHT: 5
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
   RAM: '250'
@@ -119,7 +119,7 @@ tests:
   DUNIT_PARALLEL_FORKS: '48'
   EXECUTE_TEST_TIMEOUT: 40m
   GRADLE_TASK: integrationTest
-  MAX_IN_FLIGHT: 1
+  MAX_IN_FLIGHT: 5
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
   RAM: '90'
@@ -130,75 +130,8 @@ tests:
   DUNIT_PARALLEL_FORKS: '48'
   EXECUTE_TEST_TIMEOUT: 1h
   GRADLE_TASK: upgradeTest
-  MAX_IN_FLIGHT: 2
+  MAX_IN_FLIGHT: 5
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
   RAM: '210'
   name: Upgrade
-- ARTIFACT_SLUG: stressnewtestfiles
-  CALL_STACK_TIMEOUT: '20700'
-  CPUS: '96'
-  DUNIT_PARALLEL_FORKS: '24'
-  EXECUTE_TEST_TIMEOUT: 6h
-  GRADLE_TASK: repeatTest
-  PARALLEL_DUNIT: 'true'
-  PARALLEL_GRADLE: 'false'
-  PLATFORM: linux
-  RAM: '280'
-  name: StressNew
-- ARTIFACT_SLUG: windows-acceptancetestfiles
-  CPUS: '16'
-  DUNIT_PARALLEL_FORKS: '0'
-  EXECUTE_TEST_TIMEOUT: 6h
-  GRADLE_TASK: :geode-assembly:acceptanceTest
-  MAX_IN_FLIGHT: 3
-  PARALLEL_DUNIT: 'false'
-  PARALLEL_GRADLE: 'false'
-  PLATFORM: windows
-  RAM: '64'
-  name: WindowsAcceptance
-- ARTIFACT_SLUG: windows-gfshdistributedtest
-  CPUS: '16'
-  DUNIT_PARALLEL_FORKS: '0'
-  EXECUTE_TEST_TIMEOUT: 6h
-  GRADLE_TASK: distributedTest
-  GRADLE_TASK_OPTIONS: -PtestCategory=org.apache.geode.test.junit.categories.GfshTest
-  MAX_IN_FLIGHT: 5
-  PARALLEL_DUNIT: 'false'
-  PARALLEL_GRADLE: 'false'
-  PLATFORM: windows
-  RAM: '64'
-  name: WindowsGfshDistributed
-- ARTIFACT_SLUG: windows-integrationtestfiles
-  CPUS: '16'
-  DUNIT_PARALLEL_FORKS: '0'
-  EXECUTE_TEST_TIMEOUT: 6h
-  GRADLE_TASK: integrationTest
-  GRADLE_TASK_OPTIONS: -x geode-core:integrationTest
-  MAX_IN_FLIGHT: 2
-  PARALLEL_DUNIT: 'false'
-  PARALLEL_GRADLE: 'false'
-  PLATFORM: windows
-  RAM: '64'
-  name: WindowsIntegration
-- ARTIFACT_SLUG: windows-coreintegrationtestfiles
-  CPUS: '16'
-  DUNIT_PARALLEL_FORKS: '0'
-  EXECUTE_TEST_TIMEOUT: 6h
-  GRADLE_TASK: geode-core:integrationTest
-  MAX_IN_FLIGHT: 6
-  PARALLEL_DUNIT: 'false'
-  PARALLEL_GRADLE: 'false'
-  PLATFORM: windows
-  RAM: '64'
-  name: WindowsCoreIntegration
-- ARTIFACT_SLUG: windows-unittestfiles
-  CPUS: '16'
-  DUNIT_PARALLEL_FORKS: '0'
-  EXECUTE_TEST_TIMEOUT: 6h
-  GRADLE_TASK: test
-  MAX_IN_FLIGHT: 1
-  PARALLEL_DUNIT: 'false'
-  PLATFORM: windows
-  RAM: '64'
-  name: WindowsUnit


[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run

Posted by ig...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

igodwin pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit ccedf056c687e882b7ab11b8636240023d4a5329
Author: Mark Hanson <mh...@pivotal.io>
AuthorDate: Mon Jan 27 15:27:19 2020 -0800

    remove meta-* jobs that we won't use for mass-test-run
---
 ci/pipelines/meta/jinja.template.yml | 206 +----------------------------------
 1 file changed, 1 insertion(+), 205 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index 792254f..a67e377 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -51,13 +51,7 @@ resources:
     branch: ((!geode-build-branch))
     paths:
     - ci/pipelines/images/*
-- name: geode-reaper-pipeline
-  type: git
-  source:
-    {{ github_access() | indent(4) }}
-    branch: ((!geode-build-branch))
-    paths:
-    - ci/pipelines/reaper/*
+
 - name: meta-mini-dockerfile
   type: git
   source:
@@ -71,35 +65,6 @@ resources:
     username: ((!docker-username))
     password: ((!docker-password))
     repository: gcr.io/((!gcp-project))/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
-{% if repository.fork == repository.upstream_fork %}
-- name: geode-examples-pipeline
-  type: git
-  source:
-    {{ github_access() | indent(4) }}
-    branch: ((!geode-build-branch))
-    paths:
-    - ci/pipelines/examples/*
-    - ci/pipelines/shared/*
-    - ci/pipelines/render.py
-    - ci/pipelines/meta/meta.properties
-- name: geode-pr-pipeline
-  type: git
-  source:
-    {{ github_access() | indent(4) }}
-    branch: ((!geode-build-branch))
-    paths:
-    - ci/pipelines/pull-request/*
-    - ci/pipelines/shared/*
-    - ci/pipelines/render.py
-    - ci/pipelines/meta/meta.properties
-{% endif %}
-- name: geode-metrics-pipeline
-  type: git
-  source:
-    {{ github_access() | indent(4) }}
-    branch: ((!geode-build-branch))
-    paths:
-    - ci/pipelines/metrics/*
 
 jobs:
 - name: set-images-pipeline
@@ -187,175 +152,6 @@ jobs:
         - results/pipeline-vars.yml
 
 
-{% if repository.fork == repository.upstream_fork %}
-- name: set-examples-pipeline
-  serial: true
-  public: ((!public-pipelines))
-  plan:
-  - get: geode-examples-pipeline
-    trigger: true
-  - get: meta-mini-image
-    trigger: true
-    passed: [build-meta-mini-docker-image]
-  - task: deploy-build
-    image: meta-mini-image
-    config:
-      platform: linux
-      inputs:
-        - name: geode-examples-pipeline
-      outputs:
-        - name: results
-      params:
-        OUTPUT_DIRECTORY: results
-        GEODE_BRANCH: ((geode-build-branch))
-        GEODE_FORK: ((geode-fork))
-        GEODE_REPO_NAME: ((geode-repo-name))
-        REPOSITORY_PUBLIC: {{ repository.public }}
-        ARTIFACT_BUCKET: ((artifact-bucket))
-        UPSTREAM_FORK: {{ repository.upstream_fork }}
-        PIPELINE_PREFIX: ((pipeline-prefix))
-        SANITIZED_GEODE_BRANCH: ((sanitized-geode-build-branch))
-        SANITIZED_GEODE_FORK: ((sanitized-geode-fork))
-        GCP_PROJECT: ((gcp-project))
-        PUBLIC_PIPELINES: ((public-pipelines))
-        SEMVER_PRERELEASE_TOKEN: ((semver-prerelease-token))
-      run:
-        path: geode-examples-pipeline/ci/pipelines/examples/deploy_pipeline.sh
-  - put: concourse
-    params:
-      pipelines:
-      - name: ((!pipeline-prefix))examples
-        team: ((!concourse-team))
-        config_file: results/generated-pipeline.yml
-        vars_files:
-        - results/pipeline-vars.yml
-
-- name: set-pr-pipeline
-  serial: true
-  public: ((!public-pipelines))
-  plan:
-  - get: geode-pr-pipeline
-    trigger: true
-  - get: meta-mini-image
-    trigger: true
-    passed: [build-meta-mini-docker-image]
-  - task: deploy-pr
-    image: meta-mini-image
-    config:
-      platform: linux
-      inputs:
-        - name: geode-pr-pipeline
-      outputs:
-        - name: results
-      params:
-        OUTPUT_DIRECTORY: results
-        GEODE_BRANCH: ((!geode-build-branch))
-        GEODE_FORK: ((!geode-fork))
-        GEODE_REPO_NAME: ((geode-repo-name))
-        REPOSITORY_PUBLIC: {{ repository.public }}
-        ARTIFACT_BUCKET: ((artifact-bucket))
-        UPSTREAM_FORK: {{ repository.upstream_fork }}
-        PIPELINE_PREFIX: ((pipeline-prefix))
-        GCP_PROJECT: ((gcp-project))
-        PUBLIC_PIPELINES: ((public-pipelines))
-        GRADLE_GLOBAL_ARGS: ((gradle-global-args))
-      run:
-        path: geode-pr-pipeline/ci/pipelines/pull-request/deploy_pr_pipeline.sh
-  - put: concourse
-    params:
-      pipelines:
-      - name: ((!pipeline-prefix))pr
-        team: ((!concourse-team))
-        config_file: results/generated-pipeline.yml
-        vars_files:
-        - results/pipeline-vars.yml
-
-{% endif %}
-
-- name: set-metrics-pipeline
-  serial: true
-  public: ((!public-pipelines))
-  plan:
-    - get: geode-metrics-pipeline
-      trigger: true
-    - get: meta-mini-image
-      trigger: true
-      passed: [build-meta-mini-docker-image]
-    - task: create-metrics-pipeline-yml
-      image: meta-mini-image
-      config:
-        platform: linux
-        inputs:
-          - name: geode-metrics-pipeline
-        outputs:
-          - name: results
-        params:
-          OUTPUT_DIRECTORY: results
-          GEODE_BRANCH: ((geode-build-branch))
-          GEODE_FORK: ((geode-fork))
-          GEODE_REPO_NAME: ((geode-repo-name))
-          REPOSITORY_PUBLIC: {{ repository.public }}
-          ARTIFACT_BUCKET: ((artifact-bucket))
-          UPSTREAM_FORK: {{ repository.upstream_fork }}
-          PIPELINE_PREFIX: ((pipeline-prefix))
-          SANITIZED_GEODE_BRANCH: ((sanitized-geode-build-branch))
-          SANITIZED_GEODE_FORK: ((sanitized-geode-fork))
-          GCP_PROJECT: ((gcp-project))
-          PUBLIC_PIPELINES: ((public-pipelines))
-          CONCOURSE_URL: ((concourse-url))
-          CONCOURSE_HOST: ((concourse-host))
-          CONCOURSE_TEAM: ((concourse-team))
-        run:
-          path: geode-metrics-pipeline/ci/pipelines/metrics/deploy_metrics_pipeline.sh
-    - put: concourse
-      params:
-        pipelines:
-          - name: ((!pipeline-prefix))metrics
-            team: ((!concourse-team))
-            config_file: results/generated-pipeline.yml
-            vars_files:
-              - results/pipeline-vars.yml
-
-- name: set-reaper-pipeline
-  serial: true
-  public: ((!public-pipelines))
-  plan:
-    - get: geode-reaper-pipeline
-      trigger: true
-    - get: meta-mini-image
-      trigger: true
-      passed: [build-meta-mini-docker-image]
-    - task: create-image-yml
-      image: meta-mini-image
-      config:
-        platform: linux
-        inputs:
-          - name: geode-reaper-pipeline
-        outputs:
-          - name: results
-        params:
-          OUTPUT_DIRECTORY: results
-          GEODE_BRANCH: ((geode-build-branch))
-          GEODE_FORK: ((geode-fork))
-          GEODE_REPO_NAME: ((geode-repo-name))
-          REPOSITORY_PUBLIC: {{ repository.public }}
-          UPSTREAM_FORK: {{ repository.upstream_fork }}
-          PIPELINE_PREFIX: ((pipeline-prefix))
-          SANITIZED_GEODE_BRANCH: ((sanitized-geode-build-branch))
-          SANITIZED_GEODE_FORK: ((sanitized-geode-fork))
-          GCP_PROJECT: ((gcp-project))
-          PUBLIC_PIPELINES: ((public-pipelines))
-        run:
-          path: geode-reaper-pipeline/ci/pipelines/reaper/deploy_reaper_pipeline.sh
-    - put: concourse
-      params:
-        pipelines:
-          - name: ((!pipeline-prefix))reaper
-            team: ((!concourse-team))
-            config_file: results/generated-pipeline.yml
-            vars_files:
-              - results/pipeline-vars.yml
-
 - name: build-meta-mini-docker-image
   public: ((!public-pipelines))
   serial: true