You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2021/05/28 00:21:48 UTC
[geode] branch support/1.12 updated: GEODE-9298: remove concourse
deprecation warnings
This is an automated email from the ASF dual-hosted git repository.
onichols 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 add506f GEODE-9298: remove concourse deprecation warnings
add506f is described below
commit add506fe3de4e1183dfd1a7bfbb259a190487049
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Fri May 21 12:03:15 2021 -0700
GEODE-9298: remove concourse deprecation warnings
Merging this PR will wipe Concourse history due to pipeline and/or job
name changes.
(cherry picked from commit bb9d0b9118612c3f6c16e69e2e14fd30a46b9adc)
(cherry picked from commit 682c43f26f86ef71c2c1e293e63d870cd649fefc)
(cherry picked from commit f03a577f21d37e603a81de3398fbee2ad4baea8b)
---
ci/pipelines/examples/jinja.template.yml | 4 +-
ci/pipelines/geode-build/jinja.template.yml | 84 ++++++++++++++--------------
ci/pipelines/images/jinja.template.yml | 16 +++---
ci/pipelines/meta/jinja.template.yml | 2 +-
ci/pipelines/pull-request/jinja.template.yml | 24 ++++----
ci/pipelines/reaper/jinja.template.yml | 6 +-
ci/pipelines/shared/jinja.variables.yml | 43 +++++++-------
7 files changed, 90 insertions(+), 89 deletions(-)
diff --git a/ci/pipelines/examples/jinja.template.yml b/ci/pipelines/examples/jinja.template.yml
index fb53e7b..6c04aff 100644
--- a/ci/pipelines/examples/jinja.template.yml
+++ b/ci/pipelines/examples/jinja.template.yml
@@ -95,7 +95,7 @@ resources:
- name: concourse-metadata-resource
type: concourse-metadata-resource
source: {}
-- name: 24h
+- name: daily
type: time
source: {interval: 24h}
- name: alpine-tools-image
@@ -127,7 +127,7 @@ jobs:
trigger: true
- get: geode-examples
trigger: true
- - get: 24h
+ - get: daily
trigger: true
- put: concourse-metadata-resource
{{ init_retry()|indent(2) }}
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 3c16380..39b5af3 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -24,16 +24,16 @@
{% macro plan_resource_gets(test) %}
- get: geode-ci
passed:
- - Build
-- aggregate:
+ - build
+- in_parallel:
- get: geode
trigger: true
passed:
- - Build
+ - build
- get: geode-build-version
trigger: true
passed:
- - Build
+ - build
{% endmacro %}
{%- macro deep_merge(a, b): %}
@@ -85,13 +85,13 @@ GRADLE_GLOBAL_ARGS: ((gradle-global-args))
{%- endmacro %}
{% macro all_gating_jobs() %}
- {%- for test in (tests) if not test.name=="StressNew" -%}
+ {%- for test in (tests) if not test.name=="stress-new" -%}
{%- for java_test_version in (java_test_versions) if ((not test.ONLY_JDK is defined) or test.ONLY_JDK==java_test_version.version) %}
-- {{test.name}}Test{{java_test_version.name}}
+- {{test.name}}-test-{{java_test_version.name}}
{%- endfor -%}
{%- endfor -%}
{%- for run_var in (benchmarks.flavors) %}
-- Benchmark{{ run_var.title }}
+- benchmark-{{ run_var.title }}
{%- endfor -%}
{% endmacro %}
@@ -100,54 +100,54 @@ groups:
jobs:
- {{ build_test.name }}
{{- all_gating_jobs() | indent(2) }}
- - UpdatePassingTokens
+ - update-passing-tokens
{%- if repository.upstream_fork != "apache" or repository.branch == "develop" or repository.branch.startswith("support/") %}
- - PublishArtifacts
+ - publish-artifacts
{%- endif %}
- name: complete
jobs:
- {{ build_test.name }}
{{- all_gating_jobs() | indent(2) }}
{%- if repository.upstream_fork != "apache" or repository.branch == "develop" or repository.branch.startswith("support/") %}
- - PublishArtifacts
+ - publish-artifacts
{%- endif %}
- - UpdatePassingTokens
+ - update-passing-tokens
- name: linux
jobs:
- {{ build_test.name }}
- {%- for test in (tests) if test.PLATFORM=="linux" and not test.name=="StressNew" -%}
+ {%- for test in (tests) if test.PLATFORM=="linux" and not test.name=="stress-new" -%}
{% for java_test_version in (java_test_versions) if ((not test.ONLY_JDK is defined) or test.ONLY_JDK==java_test_version.version) %}
- - {{test.name}}Test{{java_test_version.name}}
+ - {{test.name}}-test-{{java_test_version.name}}
{%- endfor -%}
{%- endfor %}
{%- for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
+ - 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) if ((not test.ONLY_JDK is defined) or test.ONLY_JDK==java_test_version.version) %}
- - {{test.name}}Test{{java_test_version.name}}
+ - {{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") and ((not test.ONLY_JDK is defined) or test.ONLY_JDK==java_test_version.version) %}
- - {{test.name}}Test{{java_test_version.name}}
+ {%- for test in (tests) if (not test.name=="stress-new") and ((not test.ONLY_JDK is defined) or test.ONLY_JDK==java_test_version.version) %}
+ - {{test.name}}-test-{{java_test_version.name}}
{%- endfor -%}
{%- endfor %}
-- name: Benchmarks
+- name: benchmarks
jobs:
{%- for run_var in (benchmarks.flavors) %}
- - Benchmark{{ run_var.title }}
+ - benchmark-{{ run_var.title }}
{%- endfor %}
-- name: Semver Management
+- name: semver-management
jobs:
{%- for semverPiece in ['major', 'minor', 'patch'] %}
- - Bump{{ semverPiece.title() }}
+ - bump-{{ semverPiece }}
{%- endfor %}
resources:
@@ -244,7 +244,7 @@ resource_types:
repository: frodenas/gcs-resource
jobs:
{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
+- name: bump-{{ semverPiece }}
serial: true
plan:
- get: geode-build-version
@@ -259,7 +259,7 @@ jobs:
public: true
max_in_flight: {{build_test.MAX_IN_FLIGHT}}
plan:
- - aggregate:
+ - in_parallel:
- get: build-weekly-fri
trigger: true
- get: geode-ci
@@ -310,7 +310,7 @@ jobs:
- name: geode-ci
- name: instance-data
timeout: 1h
- - aggregate:
+ - in_parallel:
- put: geode-build-version
params:
file: geode-build-version/number
@@ -373,7 +373,7 @@ jobs:
timeout: 5m
ensure:
do:
- - aggregate:
+ - in_parallel:
- task: archive_results
image: alpine-tools-image
config:
@@ -404,16 +404,16 @@ jobs:
- name: instance-data
timeout: 1h
-- name: UpdatePassingTokens
+- name: update-passing-tokens
public: true
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: alpine-tools-image
- get: geode
passed: &update-token-passed-anchor
{%- if repository.upstream_fork != "apache" or repository.branch == "develop" or repository.branch.startswith("support/") %}
- - PublishArtifacts
+ - publish-artifacts
{% else %}
{{- all_gating_jobs() | indent(6) }}
{% endif %}
@@ -456,21 +456,21 @@ jobs:
JSON
fi
fi
- - aggregate:
+ - in_parallel:
- put: geode-passing-tokens
params:
file: geode-passing-tokens/passing-build-tokens.json
{% for run_var in (benchmarks.flavors) %}
-- name: Benchmark{{ run_var.title }}
+- name: benchmark-{{ run_var.title }}
public: true
max_in_flight: {{ run_var.max_in_flight }}
plan:
- get: geode-ci
passed: &benchmark-inputs
- - Build
+ - build
- get: alpine-tools-image
- - aggregate:
+ - in_parallel:
- get: geode
passed: *benchmark-inputs
trigger: true
@@ -480,7 +480,7 @@ jobs:
passed: *benchmark-inputs
- put: concourse-metadata-resource
- do:
- - task: run_benchmarks{{ run_var.title }}
+ - task: run-benchmarks-{{ run_var.title }}
image: alpine-tools-image
config:
platform: linux
@@ -494,7 +494,7 @@ jobs:
BASELINE_BRANCH: {{benchmarks.baseline_branch}}
BASELINE_VERSION: {{benchmarks.baseline_version}}
FLAGS: {{ run_var.flag }}
- TAG_POSTFIX: {{ run_var.title }}
+ TAG_POSTFIX: -{{ run_var.title }}
TEST_OPTIONS: {{ run_var.options }}
run:
path: geode-ci/ci/scripts/run_benchmarks.sh
@@ -521,7 +521,7 @@ jobs:
BASELINE_BRANCH: {{benchmarks.baseline_branch}}
BASELINE_VERSION: {{benchmarks.baseline_version}}
FLAGS: {{ run_var.flag }}
- TAG_POSTFIX: {{ run_var.title }}
+ TAG_POSTFIX: -{{ run_var.title }}
TEST_OPTIONS: {{ run_var.options }}
run:
path: geode-ci/ci/scripts/cleanup_benchmarks.sh
@@ -533,19 +533,19 @@ jobs:
- name: results
{% endfor %}
{% if repository.upstream_fork != "apache" or repository.branch == "develop" or repository.branch.startswith("support/") %}
-- name: PublishArtifacts
+- name: publish-artifacts
public: true
plan:
- - aggregate:
+ - in_parallel:
- get: geode-ci
passed: &publish-passed-inputs
- - Build
+ - build
- get: alpine-tools-image
- get: geode
passed: *publish-passed-inputs
trigger: true
- get: linux-builder-image-family
- - aggregate:
+ - in_parallel:
- get: geode-build-version
trigger: true
passed: *publish-passed-inputs
@@ -621,14 +621,14 @@ jobs:
{% endif %}
-{%- for test in tests if not test.name=="StressNew" %}
+{%- for test in tests if not test.name=="stress-new" %}
{%- set parameters = {} %}
{%- do deep_merge(parameters, test) %}
{%- for java_test_version in (java_test_versions) if ((not test.ONLY_JDK is defined) or test.ONLY_JDK==java_test_version.version) %}
{%- if java_test_version.override is defined and java_test_version.override[test.name] is defined %}
{%- do deep_merge(parameters, java_test_version.override[test.name]) %}
{%- endif %}
-- name: {{test.name}}Test{{java_test_version.name}}
+- name: {{test.name}}-test-{{java_test_version.name}}
max_in_flight: {{parameters.MAX_IN_FLIGHT}}
public: true
plan:
@@ -721,7 +721,7 @@ jobs:
attempts: 5
ensure:
do:
- - aggregate:
+ - in_parallel:
- task: archive_results-{{java_test_version.name}}
image: alpine-tools-image
config:
diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml
index 43b52a6..8618bb2 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -202,7 +202,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: openjdk8-docker-image
trigger: true
- get: build-concourse-dockerfile
@@ -218,7 +218,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: test-container-docker-image
passed: [build-test-container-docker-image]
trigger: true
@@ -256,7 +256,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: google-windows-geode-builder
trigger: true
- get: alpine-tools-docker-image
@@ -291,7 +291,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: alpine-docker-image
trigger: true
- get: alpine-tools-dockerfile
@@ -305,7 +305,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: ubuntu-docker-image
trigger: true
- get: test-container-dockerfile
@@ -319,7 +319,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: alpine-docker-image
trigger: true
- get: concourse-metadata-resource-dockerfile
@@ -333,7 +333,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: alpine-docker-image
trigger: true
- get: metric-tools-dockerfile
@@ -347,7 +347,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: alpine-docker-image
trigger: true
- get: gce-instances-resource-dockerfile
diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index 5dbae3b..83e7b45 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -274,7 +274,7 @@ jobs:
public: ((public-pipelines))
serial: true
plan:
- - aggregate:
+ - in_parallel:
- get: meta-mini-dockerfile
trigger: true
- put: meta-mini-image
diff --git a/ci/pipelines/pull-request/jinja.template.yml b/ci/pipelines/pull-request/jinja.template.yml
index 6605c94..b515f09 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -23,7 +23,7 @@ groups:
jobs:
- {{ build_test.name }}
{%- for test in tests if test.PLATFORM=="linux" %}
- {%- for java_test_version in (java_test_versions) if not java_test_version.name.endswith("JDK8") or test.name == "Unit" %}
+ {%- for java_test_version in (java_test_versions) if not java_test_version.name.endswith("jdk8") or test.name == "unit" %}
- {{test.name}}Test{{java_test_version.name}}
{%- endfor %}
{%- endfor %}
@@ -95,7 +95,7 @@ jobs:
public: true
plan:
- do:
- - aggregate:
+ - in_parallel:
- get: alpine-tools-image
- get: geode
trigger: true
@@ -104,7 +104,7 @@ jobs:
- get: geode-ci
attempts: 2
- get: {{ build_test.PLATFORM }}-builder-image-family
- - aggregate:
+ - in_parallel:
- do:
- put: pull-request-job-pending
resource: geode-status
@@ -209,7 +209,7 @@ jobs:
- name: geode-results
timeout: 5m
ensure:
- aggregate:
+ in_parallel:
- task: archive_results
image: alpine-tools-image
config:
@@ -250,12 +250,12 @@ jobs:
{% for test in tests if test.PLATFORM=="linux"%}
- {%- for java_test_version in (java_test_versions) if not java_test_version.name.endswith("JDK8") or test.name == "Unit" %}
+ {%- for java_test_version in (java_test_versions) if not java_test_version.name.endswith("jdk8") or test.name == "unit" %}
- name: {{test.name}}Test{{java_test_version.name}}
public: true
plan:
- do:
- - aggregate:
+ - in_parallel:
- get: alpine-tools-image
- get: geode
trigger: true
@@ -264,12 +264,12 @@ jobs:
- get: geode-ci
attempts: 2
- get: {{ test.PLATFORM }}-builder-image-family
- - aggregate:
+ - in_parallel:
- do:
- put: pull-request-job-pending
resource: geode-status
params:
- context: {{test.name}}Test{{java_test_version.name}}
+ context: {{test.name}}-test-{{java_test_version.name}}
path: geode
status: pending
get_params: {skip_download: true}
@@ -339,7 +339,7 @@ jobs:
SERVICE_ACCOUNT: ((concourse-gcp-account))
GRADLE_GLOBAL_ARGS: ((gradle-global-args))
run:
- {%- if test.name=="StressNew" %}
+ {%- if test.name=="stress-new" %}
path: geode/ci/scripts/repeat-new-tests.sh
{%- else %}
path: geode-ci/ci/scripts/execute_tests.sh
@@ -354,7 +354,7 @@ jobs:
- put: pull-request-job-failure
resource: geode-status
params:
- context: {{test.name}}Test{{java_test_version.name}}
+ context: {{test.name}}-test-{{java_test_version.name}}
path: geode
status: failure
get_params: {skip_download: true}
@@ -377,7 +377,7 @@ jobs:
- name: geode-results
timeout: 5m
ensure:
- aggregate:
+ in_parallel:
- task: archive-results-{{java_test_version.name}}
image: alpine-tools-image
config:
@@ -411,7 +411,7 @@ jobs:
- put: pull-request-job-success
resource: geode-status
params:
- context: {{test.name}}Test{{java_test_version.name}}
+ context: {{test.name}}-test-{{java_test_version.name}}
path: geode
status: success
get_params: {skip_download: true}
diff --git a/ci/pipelines/reaper/jinja.template.yml b/ci/pipelines/reaper/jinja.template.yml
index 949f5a0..6cd7bdb 100644
--- a/ci/pipelines/reaper/jinja.template.yml
+++ b/ci/pipelines/reaper/jinja.template.yml
@@ -66,7 +66,7 @@ resources:
jobs:
- name: stop-instance
plan:
- - aggregate:
+ - in_parallel:
- get: google-cloud-sdk-image
- get: stoppable-instance
version: every
@@ -86,7 +86,7 @@ jobs:
- name: delete-instance
plan:
- - aggregate:
+ - in_parallel:
- get: google-cloud-sdk-image
- get: deletable-instance
version: every
@@ -106,7 +106,7 @@ jobs:
- name: reap-benchmark-instances
plan:
- - aggregate:
+ - in_parallel:
- get: alpine-tools-image
- get: four-times-a-day
trigger: true
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index 32585b2..5e3a69b 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -20,15 +20,16 @@ benchmarks:
baseline_version: '1.12.0'
benchmark_branch: ((geode-build-branch))
flavors:
- - title: '_base'
+ - title: 'base'
flag: ''
options: ''
max_in_flight: 4
- - title: '_with_ssl'
+ - title: 'with-ssl'
flag: '-PwithSsl -PtestJVM=/usr/lib/jvm/bellsoft-java11-amd64'
options: '--tests=*GetBenchmark --tests=*PutBenchmark'
max_in_flight: 1
- - title: '_with_security_manager'
+ - title: 'with-security-manager'
+>>>>>>> f03a577f21... GEODE-9298: remove concourse deprecation warnings
flag: '-PwithSecurityManager'
options: '--tests=Partitioned*'
max_in_flight: 2
@@ -45,7 +46,7 @@ build_test:
PARALLEL_GRADLE: 'false'
PLATFORM: linux
RAM: '16'
- name: Build
+ name: build
examples_test:
ARTIFACT_SLUG: examples
@@ -56,16 +57,16 @@ examples_test:
GRADLE_TASK: runAll
PARALLEL_DUNIT: 'false'
RAM: '16'
- name: TestExamples
+ name: test-examples
java_build_version:
- name: OpenJDK8
+ name: openjdk8
version: 8
java_test_versions:
-- name: OpenJDK8
+- name: openjdk8
version: 8
-- name: OpenJDK11
+- name: openjdk11
version: 11
metadata:
@@ -75,7 +76,7 @@ publish_artifacts:
CPUS: '8'
EXECUTE_TEST_TIMEOUT: 10m
RAM: '16'
- name: PublishArtifacts
+ name: publish-artifacts
repository:
project: geode
@@ -93,7 +94,7 @@ tests:
PARALLEL_GRADLE: 'true'
PLATFORM: linux
RAM: '16'
- name: Unit
+ name: unit
- ARTIFACT_SLUG: acceptancetestfiles
CALL_STACK_TIMEOUT: '4500'
CPUS: '8'
@@ -105,7 +106,7 @@ tests:
PARALLEL_GRADLE: 'false'
PLATFORM: linux
RAM: '12'
- name: Acceptance
+ name: acceptance
- ARTIFACT_SLUG: distributedtestfiles
CALL_STACK_TIMEOUT: '9900'
CPUS: '96'
@@ -116,7 +117,7 @@ tests:
PARALLEL_DUNIT: 'true'
PLATFORM: linux
RAM: '250'
- name: Distributed
+ name: distributed
- ARTIFACT_SLUG: integrationtestfiles
CALL_STACK_TIMEOUT: '1500'
CPUS: '96'
@@ -127,7 +128,7 @@ tests:
PARALLEL_DUNIT: 'true'
PLATFORM: linux
RAM: '90'
- name: Integration
+ name: integration
- ARTIFACT_SLUG: upgradetestfiles
CALL_STACK_TIMEOUT: '3000'
CPUS: '96'
@@ -138,7 +139,7 @@ tests:
PARALLEL_DUNIT: 'true'
PLATFORM: linux
RAM: '210'
- name: Upgrade
+ name: upgrade
- ARTIFACT_SLUG: stressnewtestfiles
CALL_STACK_TIMEOUT: '20700'
CPUS: '96'
@@ -149,7 +150,7 @@ tests:
PARALLEL_GRADLE: 'false'
PLATFORM: linux
RAM: '280'
- name: StressNew
+ name: stress-new
- ARTIFACT_SLUG: windows-acceptancetestfiles
CPUS: '16'
DUNIT_PARALLEL_FORKS: '0'
@@ -160,7 +161,7 @@ tests:
PARALLEL_GRADLE: 'false'
PLATFORM: windows
RAM: '64'
- name: WindowsAcceptance
+ name: windows-acceptance
- ARTIFACT_SLUG: windows-gfshdistributedtest
CPUS: '16'
DUNIT_PARALLEL_FORKS: '0'
@@ -172,7 +173,7 @@ tests:
PARALLEL_GRADLE: 'false'
PLATFORM: windows
RAM: '64'
- name: WindowsGfshDistributed
+ name: windows-gfsh-distributed
- ARTIFACT_SLUG: windows-integrationtestfiles
CPUS: '16'
DUNIT_PARALLEL_FORKS: '0'
@@ -184,7 +185,7 @@ tests:
PARALLEL_GRADLE: 'false'
PLATFORM: windows
RAM: '64'
- name: WindowsIntegration
+ name: windows-integration
- ARTIFACT_SLUG: windows-coreintegrationtestfiles
CPUS: '16'
DUNIT_PARALLEL_FORKS: '0'
@@ -195,7 +196,7 @@ tests:
PARALLEL_GRADLE: 'false'
PLATFORM: windows
RAM: '64'
- name: WindowsCoreIntegration
+ name: windows-core-integration
- ARTIFACT_SLUG: windows-unittestfiles
CPUS: '16'
DUNIT_PARALLEL_FORKS: '0'
@@ -205,7 +206,7 @@ tests:
PARALLEL_DUNIT: 'false'
PLATFORM: windows
RAM: '64'
- name: WindowsUnit
+ name: windows-unit
- ARTIFACT_SLUG: apicheck
CALL_STACK_TIMEOUT: '20700'
CPUS: '4'
@@ -218,4 +219,4 @@ tests:
PARALLEL_GRADLE: 'false'
PLATFORM: linux
RAM: '16'
- name: ApiCheck
+ name: api-check