You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by mh...@apache.org on 2020/01/29 21:32:24 UTC
[geode] branch mass-test-run updated (c3ab1ac -> 929e88c)
This is an automated email from the ASF dual-hosted git repository.
mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard c3ab1ac remove meta-* jobs that we won't use for mass-test-run
discard 61a2448 Mass-test-run branch, no windows or publication jobs
add 6ab8757 GEODE-7742: move existing membership unit/integration tests to geode-… (#4634)
add 9de8d20 GEODE-7736: Remove depencies on core from MembershipOnlyTest and add two member test (#4621)
add eb3f7dc GEODE-7604: Fix QueryConfigurationServiceConstraintsDistributedTest (#4641)
add fe1d4d1 GEODE-7650: Cleanup PutAllClientServerDistributedTest (#4644)
add fd9fde8 GEODE-6819: Fix PartitionedRegionSingleHopDUnitTest (#4645)
add 11048af GEODE-7600-4: Further cleanup (#4642)
new e7edb8e Mass-test-run branch, no windows or publication jobs
new 929e88c 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 (c3ab1ac)
\
N -- N -- N refs/heads/mass-test-run (929e88c)
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:
.../geode/cache/ConnectionPoolDUnitTest.java | 244 ++---
.../cache/PartitionedRegionSingleHopDUnitTest.java | 1140 +++++++++-----------
.../sockets/DestroyEntryPropagationDUnitTest.java | 4 +-
.../membership/gms/MembershipOnlyTest.java | 55 +-
.../distributed/internal/InternalLocator.java | 3 +-
.../membership/InternalDistributedMember.java | 5 +
.../apache/geode/internal/cache/LocalRegion.java | 1 -
.../cache/tier/sockets/CacheClientProxy.java | 4 +-
.../cache/tier/sockets/CacheClientUpdater.java | 74 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 143 ++-
...igurationServiceConstraintsDistributedTest.java | 440 ++++----
.../cache/PutAllClientServerDistributedTest.java | 1039 ++++++++----------
.../cache30/CertifiableTestCacheListener.java | 61 +-
.../dunit/cache/internal/JUnit4CacheTestCase.java | 4 +-
geode-membership/build.gradle | 5 +-
.../membership/GMSMembershipViewJUnitTest.java | 22 +-
.../MembershipDependenciesJUnitTest.java | 4 +
.../api/MemberIdentifierFactoryImplTest.java | 0
.../membership/api/MembershipAPIArchUnitTest.java | 4 +-
.../membership/gms/GMSMemberDataJUnitTest.java | 0
.../membership/gms/GMSMembershipJUnitTest.java | 156 +--
.../internal/membership/gms/GMSUtilTest.java | 0
.../membership/gms/MemberDataBuilderImplTest.java | 3 +-
.../gms/messenger/GMSEncryptJUnitTest.java | 23 +-
.../gms/messenger/GMSQuorumCheckerJUnitTest.java | 29 +-
.../gms/messenger/StatRecorderJUnitTest.java | 6 -
.../membership/gms/util/MembershipAddressUtil.java | 68 ++
.../membership/api/MemberIdentifierImpl.java | 2 +-
.../membership/api/MembershipLocatorBuilder.java | 8 +-
.../internal/membership/gms/GMSMemberData.java | 3 +
.../membership/gms/MemberDataBuilderImpl.java | 3 +-
.../gms/MembershipLocatorBuilderImpl.java | 16 +-
.../internal/membership/gms/Services.java | 3 +
.../gms/locator/MembershipLocatorImpl.java | 6 +
.../serialization/DataSerializableFixedID.java | 2 +-
.../serialization/StaticSerialization.java | 1 +
36 files changed, 1731 insertions(+), 1850 deletions(-)
rename {geode-core/src/test => geode-membership/src/integrationTest}/java/org/apache/geode/distributed/internal/membership/GMSMembershipViewJUnitTest.java (94%)
rename {geode-core/src/test => geode-membership/src/integrationTest}/java/org/apache/geode/distributed/internal/membership/MembershipDependenciesJUnitTest.java (94%)
rename {geode-core => geode-membership}/src/integrationTest/java/org/apache/geode/distributed/internal/membership/api/MemberIdentifierFactoryImplTest.java (100%)
rename {geode-core/src/test => geode-membership/src/integrationTest}/java/org/apache/geode/distributed/internal/membership/api/MembershipAPIArchUnitTest.java (94%)
rename {geode-core/src/test => geode-membership/src/integrationTest}/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberDataJUnitTest.java (100%)
rename {geode-core => geode-membership}/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMembershipJUnitTest.java (73%)
rename {geode-core/src/test => geode-membership/src/integrationTest}/java/org/apache/geode/distributed/internal/membership/gms/GMSUtilTest.java (100%)
rename {geode-core/src/test => geode-membership/src/integrationTest}/java/org/apache/geode/distributed/internal/membership/gms/MemberDataBuilderImplTest.java (98%)
rename {geode-core => geode-membership}/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java (92%)
rename {geode-core => geode-membership}/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java (92%)
rename {geode-core/src/test => geode-membership/src/integrationTest}/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorderJUnitTest.java (95%)
create mode 100644 geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/util/MembershipAddressUtil.java
[geode] 02/02: remove meta-* jobs that we won't use for
mass-test-run
Posted by mh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 929e88c937367c756fd52c46e37bffc18fa20ef8
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
[geode] 01/02: Mass-test-run branch, no windows or publication jobs
Posted by mh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e7edb8e46f59116e2821108dc2262f5e0d1347bd
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 191d68e..a4fc321 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