You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by di...@apache.org on 2018/11/09 22:19:09 UTC

[geode] branch develop updated (c14d960 -> 9b2a423)

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

dixie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.


    from c14d960  Feature/geode 6016 (#2820)
     add d7aa60c  GEODE-6009 add Java 11 to PR pipeline
     new 9b2a423  Merge pull request #2806 from onichols-pivotal/GEODE-6009-add-java-11-to-PR-pipeline

The 1 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:
 ci/pipelines/pull-request/jinja.template.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)


[geode] 01/01: Merge pull request #2806 from onichols-pivotal/GEODE-6009-add-java-11-to-PR-pipeline

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

dixie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 9b2a4239b79822ee6184e8fdbbf06a3de96c37bf
Merge: c14d960 d7aa60c
Author: Dick Cavender <dc...@pivotal.io>
AuthorDate: Fri Nov 9 14:18:58 2018 -0800

    Merge pull request #2806 from onichols-pivotal/GEODE-6009-add-java-11-to-PR-pipeline
    
    GEODE-6009 add Java 11 to PR pipeline

 ci/pipelines/pull-request/jinja.template.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --cc ci/pipelines/pull-request/jinja.template.yml
index 4e2bff7,873594d..860d8e3
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@@ -21,10 -21,20 +21,12 @@@
  groups:
  - name: main
    jobs:
 -  - Build
  {%- for test in tests if not test.name.startswith("Windows") %}
-   - {{test.name}}Test
+   {%- for java_test_version in (java_test_versions) %}
+   - {{test.name}}Test{{java_test_version.name}}
+   {%- endfor %}
  {%- endfor %}
  resources:
 -- name: docker-geode-build-image
 -  type: docker-image
 -  source:
 -    password: ((!docker-password))
 -    repository: gcr.io/((gcp-project))/((pipeline-prefix))((!docker-image-name))
 -    tag: latest
 -    username: ((!docker-username))
  - name: geode
    type: pull-request
    source:
@@@ -64,8 -75,65 +66,9 @@@ resource_types
      tag: latest
      username: ((!docker-username))
  jobs:
 -- name: Build
 -  public: true
 -  plan:
 -  - aggregate:
 -    - get: geode
 -      trigger: true
 -      params:
 -        fetch_merge: true
 -        git:
 -          depth: 100
 -      version: every
 -    - get: geode-ci
 -    - get: docker-geode-build-image
 -      params:
 -        rootfs: true
 -  - get: geode-unmerged-request
 -    resource: geode
 -    params:
 -      fetch_merge: false
 -    version: every
 -  - aggregate:
 -    - put: geode
 -      params:
 -        context: $BUILD_JOB_NAME
 -        path: geode-unmerged-request
 -        status: pending
 -    - task: build
 -      config:
 -        platform: linux
 -        params:
 -          MAINTENANCE_VERSION: {{repository.branch}}
 -          ARTIFACT_BUCKET: ((artifact-bucket))
 -          SERVICE_ACCOUNT: ((!concourse-gcp-account))
 -        run:
 -          path: geode-ci/ci/scripts/build.sh
 -        inputs:
 -        - name: geode
 -        - name: geode-ci
 -        outputs:
 -        - name: built-geode
 -        - name: results
 -      image: docker-geode-build-image
 -      on_failure:
 -        aggregate:
 -        - put: geode
 -          params:
 -            context: $BUILD_JOB_NAME
 -            path: geode-unmerged-request
 -            status: failure
 -      on_success:
 -        aggregate:
 -        - put: geode
 -          params:
 -            context: $BUILD_JOB_NAME
 -            path: geode-unmerged-request
 -            status: success
  {% for test in tests if not test.name.startswith("Windows")%}
- - name: {{test.name}}Test
+   {%- for java_test_version in (java_test_versions) %}
+ - name: {{test.name}}Test{{java_test_version.name}}
    public: true
    plan:
    - do:
@@@ -79,13 -151,17 +82,13 @@@
          - put: pull-request-job-pending
            resource: geode
            params:
 -            context: $BUILD_JOB_NAME
 -            path: geode-unmerged-request
 +            context: {{test.name}}Test
 +            path: geode
              status: pending
 +          get_params: {skip_download: true}
        - do:
          - put: concourse-metadata-resource
-         - task: create_instance
+         - task: create_instance-{{java_test_version.name}}
            {{- alpine_tools_config()|indent(10) }}
              params:
                CPUS: {{test.CPUS}}
@@@ -145,13 -223,12 +150,13 @@@
        - put: pull-request-job-failure
          resource: geode
          params:
 -          context: $BUILD_JOB_NAME
 -          path: geode-unmerged-request
 +          context: {{test.name}}Test
 +          path: geode
            status: failure
 +        get_params: {skip_download: true}
      ensure:
        do:
-       - task: rsync_code_down
+       - task: rsync_code_down-{{java_test_version.name}}
          {{- alpine_tools_config()|indent(8) }}
            params:
              JAVA_BUILD_VERSION: 8
@@@ -196,8 -273,8 +201,9 @@@
        - put: pull-request-job-success
          resource: geode
          params:
 -          context: $BUILD_JOB_NAME
 -          path: geode-unmerged-request
 +          context: {{test.name}}Test
 +          path: geode
            status: success
 +        get_params: {skip_download: true}
  {% endfor %}
+ {% endfor %}