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:02:36 UTC

[geode] branch support/1.14 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.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 682c43f  GEODE-9298: remove concourse deprecation warnings
682c43f is described below

commit 682c43f26f86ef71c2c1e293e63d870cd649fefc
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)
---
 .asf.yaml                                     | 10 ++--
 ci/pipelines/examples/jinja.template.yml      |  4 +-
 ci/pipelines/geode-build/jinja.template.yml   | 82 +++++++++++++--------------
 ci/pipelines/images/jinja.template.yml        | 16 +++---
 ci/pipelines/mass-test-run/jinja.template.yml | 38 ++++++-------
 ci/pipelines/pull-request/jinja.template.yml  | 24 ++++----
 ci/pipelines/reaper/jinja.template.yml        |  6 +-
 ci/pipelines/shared/jinja.variables.yml       | 44 +++++++-------
 8 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index dcd55a6..a46ede5 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -37,11 +37,11 @@ github:
         strict: false
         # contexts are the names of checks that must pass
         contexts:
-          - concourse-ci/ApiCheckTestOpenJDK11
-          - concourse-ci/Build
-          - concourse-ci/StressNewTestOpenJDK11
-          - concourse-ci/UnitTestOpenJDK11
-          - concourse-ci/UnitTestOpenJDK8
+          - concourse-ci/api-check-test-openjdk11
+          - concourse-ci/build
+          - concourse-ci/stress-new-test-openjdk11
+          - concourse-ci/unit-test-openjdk11
+          - concourse-ci/unit-test-openjdk8
 
       required_pull_request_reviews:
         dismiss_stale_reviews: false
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 637f691..3016d07 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
     version: every
 {% endmacro %}
 
@@ -86,13 +86,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 %}
 
@@ -101,54 +101,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:
     tag: latest
 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: geode-ci
     - get: alpine-tools-image
     - get: geode
@@ -308,7 +308,7 @@ jobs:
           - name: geode-ci
           - name: instance-data
         timeout: 1h
-  - aggregate:
+  - in_parallel:
     - put: geode-build-version
       params:
         file: geode-build-version/number
@@ -374,7 +374,7 @@ jobs:
         attempts: 5
       ensure:
         do:
-        - aggregate:
+        - in_parallel:
           - task: archive_results
             image: alpine-tools-image
             config:
@@ -407,16 +407,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 %}
@@ -459,21 +459,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
@@ -484,7 +484,7 @@ jobs:
       version: every
     - put: concourse-metadata-resource
   - do:
-    - task: run_benchmarks{{ run_var.title }}
+    - task: run-benchmarks-{{ run_var.title }}
       image: alpine-tools-image
       config:
         platform: linux
@@ -498,7 +498,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 }}
           PURPOSE: ((pipeline-prefix))geode-benchmarks
         run:
@@ -526,7 +526,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
@@ -538,10 +538,10 @@ 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
@@ -550,7 +550,7 @@ jobs:
       passed: *publish-passed-inputs
       trigger: true
     - get: linux-builder-image-family
-  - aggregate:
+  - in_parallel:
     - get: geode-build-version
       trigger: true
       passed: *publish-passed-inputs
@@ -628,14 +628,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:
@@ -729,7 +729,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 74a3207..c5148c9 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -237,7 +237,7 @@ jobs:
   public: ((public-pipelines))
   serial: true
   plan:
-  - aggregate:
+  - in_parallel:
     - get: openjdk8-docker-image
       trigger: true
     - get: build-concourse-dockerfile
@@ -286,7 +286,7 @@ jobs:
   public: ((public-pipelines))
   serial: true
   plan:
-  - aggregate:
+  - in_parallel:
     - get: test-container-docker-image
       passed: [build-test-container-docker-image]
       trigger: true
@@ -324,7 +324,7 @@ jobs:
   public: ((public-pipelines))
   serial: true
   plan:
-  - aggregate:
+  - in_parallel:
     - get: google-windows-geode-builder
       trigger: true
     - get: alpine-tools-docker-image
@@ -359,7 +359,7 @@ jobs:
   public: ((public-pipelines))
   serial: true
   plan:
-  - aggregate:
+  - in_parallel:
     - get: alpine-docker-image
       trigger: true
     - get: alpine-tools-dockerfile
@@ -373,7 +373,7 @@ jobs:
   public: ((public-pipelines))
   serial: true
   plan:
-  - aggregate:
+  - in_parallel:
     - get: ubuntu-docker-image
       trigger: true
     - get: test-container-dockerfile
@@ -387,7 +387,7 @@ jobs:
   public: ((public-pipelines))
   serial: true
   plan:
-  - aggregate:
+  - in_parallel:
     - get: alpine-docker-image
       trigger: true
     - get: concourse-metadata-resource-dockerfile
@@ -401,7 +401,7 @@ jobs:
   public: ((public-pipelines))
   serial: true
   plan:
-  - aggregate:
+  - in_parallel:
     - get: alpine-docker-image
       trigger: true
     - get: metric-tools-dockerfile
@@ -415,7 +415,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/mass-test-run/jinja.template.yml b/ci/pipelines/mass-test-run/jinja.template.yml
index 7f4e1bc..dda490b 100644
--- a/ci/pipelines/mass-test-run/jinja.template.yml
+++ b/ci/pipelines/mass-test-run/jinja.template.yml
@@ -24,15 +24,15 @@
 {% macro plan_resource_gets(test) %}
 - in_parallel:
   - get: geode-ci
-    passed: [PinGeode]
+    passed: [pin-geode]
     params:
       depth: 1
   - get: geode
-    passed: [PinGeode]
+    passed: [pin-geode]
     params:
       depth: 1
   - get: geode-build-version
-    passed: [PinGeode]
+    passed: [pin-geode]
 {% endmacro %}
 
 {%- macro deep_merge(a, b): %}
@@ -161,7 +161,7 @@ resource_types:
     repository: frodenas/gcs-resource
 
 jobs:
-- name: PinGeode
+- name: pin-geode
   serial: true
   plan:
   - in_parallel:
@@ -175,15 +175,15 @@ jobs:
         depth: 1
     - get: geode-build-version
 
-- name: TriggerMassRun
+- name: trigger-mass-run
   serial: true
   plan:
   - in_parallel:
     - get: weekly
       trigger: true
-      passed: [PinGeode]
+      passed: [pin-geode]
     - get: alpine-tools-image
-  - task: run-distributed-test-N-times
+  - task: run-distributed-test-n-times
     image: alpine-tools-image
     config:
       platform: linux
@@ -205,17 +205,17 @@ jobs:
           TARGET_NAME=concourse
           ./fly -t ${TARGET_NAME} login -c "${CONCOURSE_URL}" -n "${CONCOURSE_TEAM}" -u "${CONCOURSE_USERNAME}" -p "${CONCOURSE_PASSWORD}"
           for t in $(seq ${MASS_RUN_NUMBER}); do
-            ./fly -t ${TARGET_NAME} trigger-job -j ${PIPELINE_PREFIX}mass-test-run/DistributedTestOpenJDK8
+            ./fly -t ${TARGET_NAME} trigger-job -j ${PIPELINE_PREFIX}mass-test-run/distributed-test-openjdk8
           done
 
-{%- for test in tests if test.name=="Distributed" %}
+{%- for test in tests if test.name=="distributed" %}
   {%- set parameters = {} %}
   {%- do deep_merge(parameters, test) %}
-  {%- for java_test_version in (java_test_versions) if java_test_version.name=="OpenJDK8" -%}
+  {%- for java_test_version in (java_test_versions) if java_test_version.name=="openjdk8" -%}
     {%- 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: 10
   public: true
   plan:
@@ -223,7 +223,7 @@ jobs:
     {{- plan_resource_gets(test) |indent(4) }}
       - put: concourse-metadata-resource
       - get: alpine-tools-image
-        passed: [TriggerMassRun]
+        passed: [trigger-mass-run]
       - get: {{ test.PLATFORM}}-builder-image-family
     - do:
       {{ init_retry()|indent(6) }}
@@ -310,7 +310,7 @@ jobs:
                 attempts: 5
               ensure:
                 do:
-                - aggregate:
+                - in_parallel:
                   - task: archive_results-{{java_test_version.name}}
                     image: alpine-tools-image
                     config:
@@ -350,11 +350,11 @@ jobs:
   plan:
   - in_parallel:
     - get: geode
-      passed: [{{test.name}}Test{{java_test_version.name}}]
+      passed: [{{test.name}}-test-{{java_test_version.name}}]
     - get: alpine-tools-image
-      passed: [TriggerMassRun]
+      passed: [trigger-mass-run]
     - get: test-finish-time
-      passed: [{{test.name}}Test{{java_test_version.name}}]
+      passed: [{{test.name}}-test-{{java_test_version.name}}]
       trigger: true
     - put: concourse-metadata-resource
   - task: poll-for-test-run-completion
@@ -371,7 +371,7 @@ jobs:
           . concourse-metadata-resource/concourse_metadata
           curl -L -k -o fly "((concourse-url))/api/v1/cli?arch=amd64&platform=linux"
           chmod +x fly
-          job="{{test.name}}Test{{java_test_version.name}}"
+          job="{{test.name}}-test-{{java_test_version.name}}"
           ./fly -t cc login \
             --concourse-url=((concourse-url)) \
             --team-name=((concourse-team)) \
@@ -427,7 +427,7 @@ jobs:
           . concourse-metadata-resource/concourse_metadata
           curl -L -k -o fly "((concourse-url))/api/v1/cli?arch=amd64&platform=linux"
           chmod +x fly
-          job="{{test.name}}Test{{java_test_version.name}}"
+          job="{{test.name}}-test-{{java_test_version.name}}"
           ./fly -t cc login \
             --concourse-url=((concourse-url)) \
             --team-name=((concourse-team)) \
@@ -442,6 +442,6 @@ jobs:
             --number-of-builds {{metadata.mass_test_run_iterations}} \
             ((concourse-url)) \
             ${BUILD_PIPELINE_NAME} \
-            {{test.name}}Test{{java_test_version.name}}
+            {{test.name}}-test-{{java_test_version.name}}
 {% endfor -%}
 {% endfor -%}
diff --git a/ci/pipelines/pull-request/jinja.template.yml b/ci/pipelines/pull-request/jinja.template.yml
index e210315..a154495 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 %}
-  {%- 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 %}
@@ -115,7 +115,7 @@ jobs:
   public: true
   plan:
   - do:
-    - aggregate:
+    - in_parallel:
       - get: alpine-tools-image
       - get: geode
         trigger: true
@@ -126,7 +126,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
@@ -233,7 +233,7 @@ jobs:
         timeout: 15m
         attempts: 5
       ensure:
-        aggregate:
+        in_parallel:
         - task: archive_results
           image: alpine-tools-image
           config:
@@ -274,12 +274,12 @@ jobs:
 
 
 {% for test in tests %}
-  {%- 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
 {%- if test.PLATFORM=="linux" %}
       - get: geode
@@ -295,12 +295,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}
@@ -377,7 +377,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/ci/scripts/repeat-new-tests.sh
           {%- else %}
           path: geode-ci/ci/scripts/execute_tests.sh
@@ -392,7 +392,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}
@@ -416,7 +416,7 @@ jobs:
         timeout: 15m
         attempts: 5
       ensure:
-        aggregate:
+        in_parallel:
         - task: archive-results-{{java_test_version.name}}
           image: alpine-tools-image
           config:
@@ -450,7 +450,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 c7cd190..48b7b97 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -20,17 +20,17 @@ benchmarks:
   baseline_version: '1.13.2'
   benchmark_branch: ((geode-build-branch))
   flavors:
-  - title: '_base'
+  - title: 'base'
     flag: ''
     options: ''
     max_in_flight: 4
     timeout: 24h
-  - title: '_with_ssl'
+  - title: 'with-ssl'
     flag: '-PwithSsl -PtestJVM=/usr/lib/jvm/bellsoft-java11-amd64'
     options: '--tests=*GetBenchmark --tests=*PutBenchmark'
     max_in_flight: 1
     timeout: 8h
-  - title: '_with_security_manager'
+  - title: 'with-security-manager'
     flag: '-PwithSecurityManager'
     options: '--tests=Partitioned*'
     max_in_flight: 2
@@ -48,7 +48,7 @@ build_test:
   PARALLEL_GRADLE: 'false'
   PLATFORM: linux
   RAM: '16'
-  name: Build
+  name: build
 
 examples_test:
   ARTIFACT_SLUG: examples
@@ -59,16 +59,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:
@@ -79,7 +79,7 @@ publish_artifacts:
   CPUS: '8'
   EXECUTE_TEST_TIMEOUT: 10m
   RAM: '16'
-  name: PublishArtifacts
+  name: publish-artifacts
 
 repository:
   project: geode
@@ -97,7 +97,7 @@ tests:
   PARALLEL_GRADLE: 'true'
   PLATFORM: linux
   RAM: '16'
-  name: Unit
+  name: unit
 - ARTIFACT_SLUG: acceptancetestfiles
   CALL_STACK_TIMEOUT: '6300'
   CPUS: '8'
@@ -109,7 +109,7 @@ tests:
   PARALLEL_GRADLE: 'false'
   PLATFORM: linux
   RAM: '12'
-  name: Acceptance
+  name: acceptance
 - ARTIFACT_SLUG: distributedtestfiles
   CALL_STACK_TIMEOUT: '9900'
   CPUS: '96'
@@ -120,7 +120,7 @@ tests:
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
   RAM: '250'
-  name: Distributed
+  name: distributed
 - ARTIFACT_SLUG: integrationtestfiles
   CALL_STACK_TIMEOUT: '1500'
   CPUS: '96'
@@ -131,7 +131,7 @@ tests:
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
   RAM: '90'
-  name: Integration
+  name: integration
 - ARTIFACT_SLUG: upgradetestfiles
   CALL_STACK_TIMEOUT: '4800'
   CPUS: '96'
@@ -142,7 +142,7 @@ tests:
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
   RAM: '210'
-  name: Upgrade
+  name: upgrade
 - ARTIFACT_SLUG: redistests
   CALL_STACK_TIMEOUT: '1200'
   CPUS: '4'
@@ -155,7 +155,7 @@ tests:
   PARALLEL_GRADLE: 'true'
   PLATFORM: linux
   RAM: '8'
-  name: Redis
+  name: redis
 - ARTIFACT_SLUG: stressnewtestfiles
   CALL_STACK_TIMEOUT: '20700'
   CPUS: '96'
@@ -166,7 +166,7 @@ tests:
   PARALLEL_GRADLE: 'false'
   PLATFORM: linux
   RAM: '280'
-  name: StressNew
+  name: stress-new
 - ARTIFACT_SLUG: windows-acceptancetestfiles
   CPUS: '16'
   DUNIT_PARALLEL_FORKS: '0'
@@ -177,7 +177,7 @@ tests:
   PARALLEL_GRADLE: 'false'
   PLATFORM: windows
   RAM: '64'
-  name: WindowsAcceptance
+  name: windows-acceptance
 - ARTIFACT_SLUG: windows-gfshdistributedtest
   CPUS: '16'
   DUNIT_PARALLEL_FORKS: '0'
@@ -189,7 +189,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'
@@ -201,7 +201,7 @@ tests:
   PARALLEL_GRADLE: 'false'
   PLATFORM: windows
   RAM: '64'
-  name: WindowsIntegration
+  name: windows-integration
 - ARTIFACT_SLUG: windows-coreintegrationtestfiles
   CPUS: '16'
   DUNIT_PARALLEL_FORKS: '0'
@@ -212,7 +212,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'
@@ -222,7 +222,7 @@ tests:
   PARALLEL_DUNIT: 'false'
   PLATFORM: windows
   RAM: '64'
-  name: WindowsUnit
+  name: windows-unit
 - ARTIFACT_SLUG: apicheck
   CALL_STACK_TIMEOUT: '20700'
   CPUS: '4'
@@ -235,4 +235,4 @@ tests:
   PARALLEL_GRADLE: 'false'
   PLATFORM: linux
   RAM: '16'
-  name: ApiCheck
+  name: api-check