You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/07/31 03:02:19 UTC

[geode] branch develop updated: GEODE-5503: Reduce overhead wait time on main pipeline.

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new 7af0669  GEODE-5503: Reduce overhead wait time on main pipeline.
7af0669 is described below

commit 7af0669c34fc9a718546e6a66a48f029c4457057
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 30 20:02:10 2018 -0700

    GEODE-5503: Reduce overhead wait time on main pipeline.
---
 ci/pipelines/geode-build/base.yml          |  7 ----
 ci/pipelines/geode-build/test-template.yml | 61 +++++++++++++++++-------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/ci/pipelines/geode-build/base.yml b/ci/pipelines/geode-build/base.yml
index 5f47194..9773262 100644
--- a/ci/pipelines/geode-build/base.yml
+++ b/ci/pipelines/geode-build/base.yml
@@ -42,13 +42,6 @@ resources:
     password: ((!docker-password))
     repository: gcr.io/apachegeode-ci/((!docker-image-prefix))((!docker-image-name))
     tag: latest
-- name: alpine-tools-image
-  type: docker-image
-  source:
-    username: ((!docker-username))
-    password: ((!docker-password))
-    repository: gcr.io/apachegeode-ci/((!docker-image-prefix))alpine-tools
-    tag: latest
 - name: geode
   type: git
   source:
diff --git a/ci/pipelines/geode-build/test-template.yml b/ci/pipelines/geode-build/test-template.yml
index a06121e..610fb5d 100644
--- a/ci/pipelines/geode-build/test-template.yml
+++ b/ci/pipelines/geode-build/test-template.yml
@@ -15,6 +15,15 @@
 # limitations under the License.
 
 ---
+
+image_resource: &alpine-tools-image
+  type: docker-image
+  source:
+    username: ((!docker-username))
+    password: ((!docker-password))
+    repository: gcr.io/apachegeode-ci/((!docker-image-prefix))alpine-tools
+    tag: latest
+
 jobs:
 - name: (( grab metadata.job.name ))
   serial: false
@@ -22,35 +31,32 @@ jobs:
   plan:
   - do:
     - aggregate:
-      - put: concourse-metadata-resource
       - get: geode
         passed: [Build]
       - get: geode-ci
       - get: geode-build-version
         passed: [Build]
         trigger: true
-      - get: alpine-tools-image
-        params:
-          rootfs: true
-    - task: start_instance
-      image: alpine-tools-image
-      timeout: 5m
-      config:
-        inputs:
-          - name: concourse-metadata-resource
-          - name: geode-ci
-        outputs:
-          - name: instance-data
-        platform: linux
-        params:
-          CPUS: (( grab metadata.job.cpus ))
-          RAM: (( grab metadata.job.ram ))
-          GEODE_BRANCH: (( grab metadata.geode-build-branch ))
-          GEODE_FORK: (( grab metadata.geode-fork ))
-        run:
-          path: geode-ci/ci/scripts/start_instance.sh
+      - do:
+        - put: concourse-metadata-resource
+        - task: start_instance
+          timeout: 5m
+          config:
+            inputs:
+            - name: concourse-metadata-resource
+            - name: geode-ci
+            outputs:
+            - name: instance-data
+            platform: linux
+            image_resource: *alpine-tools-image
+            params:
+              CPUS: (( grab metadata.job.cpus ))
+              RAM: (( grab metadata.job.ram ))
+              GEODE_BRANCH: (( grab metadata.geode-build-branch ))
+              GEODE_FORK: (( grab metadata.geode-fork ))
+            run:
+              path: geode-ci/ci/scripts/start_instance.sh
     - task: rsync_code_up
-      image: alpine-tools-image
       timeout: 5m
       config:
         inputs:
@@ -58,20 +64,20 @@ jobs:
           - name: geode
           - name: instance-data
         platform: linux
+        image_resource: *alpine-tools-image
         run:
           path: geode-ci/ci/scripts/rsync_code_up.sh
     - task: prepopulate_build
-      image: alpine-tools-image
       config:
         inputs:
           - name: geode-ci
           - name: geode
           - name: instance-data
         platform: linux
+        image_resource: *alpine-tools-image
         run:
           path: geode-ci/ci/scripts/prepopulate_build.sh
     - task: execute_tests
-      image: alpine-tools-image
       timeout: (( grab metadata.job.timeout ))
       config:
         inputs:
@@ -79,6 +85,7 @@ jobs:
           - name: geode
           - name: instance-data
         platform: linux
+        image_resource: *alpine-tools-image
         params:
           MAINTENANCE_VERSION: (( grab metadata.geode-build-branch ))
           SERVICE_ACCOUNT: ((!concourse-gcp-account))
@@ -94,7 +101,6 @@ jobs:
     ensure:
       do:
       - task: rsync_code_down
-        image: alpine-tools-image
         timeout: 5m
         config:
           inputs:
@@ -103,13 +109,13 @@ jobs:
           outputs:
             - name: geode-results
           platform: linux
+          image_resource: *alpine-tools-image
           run:
             path: geode-ci/ci/scripts/rsync_code_down.sh
       ensure:
         do:
         - aggregate:
           - task: archive_results
-            image: alpine-tools-image
             timeout: 1h
             config:
               inputs:
@@ -118,6 +124,7 @@ jobs:
                 - name: geode-build-version
                 - name: geode-results
               platform: linux
+              image_resource: *alpine-tools-image
               params:
                 MAINTENANCE_VERSION: (( grab metadata.geode-build-branch ))
                 SERVICE_ACCOUNT: ((!concourse-gcp-account))
@@ -127,12 +134,12 @@ jobs:
               run:
                 path: geode-ci/ci/scripts/archive_results.sh
           - task: stop_instance
-            image: alpine-tools-image
             timeout: 1h
             config:
               inputs:
                 - name: geode-ci
                 - name: instance-data
               platform: linux
+              image_resource: *alpine-tools-image
               run:
                 path: geode-ci/ci/scripts/stop_instance.sh