From 7ab8e4cee726018347e561b2133f420cefc364d5 Mon Sep 17 00:00:00 2001
From: ghatwala <ghatwala@us.ibm.com>
Date: Tue, 25 Sep 2018 17:17:17 +0530
Subject: [PATCH 1/3] Adding power support

Below changes made to work on power
- Reduced rvm version to 2.4.1 from 2.5.1
- added this global env variable - "CHIRP_S3_REPEATS=0"
- Added power queue for vm(builds.power) and container(builds.power.container) deployments.
---
 .travis.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e974840a5..cfa5c3340 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,15 @@
 language: ruby
 sudo: false
-rvm: 2.5.1
+rvm: 2.4.1
 env:
   global:
   - CHIRP_SUMMARY_OUTPUT="${TRAVIS_BUILD_DIR}/chirp.json"
   - SITE=org
+  - CHIRP_S3_REPEATS=0
 addons: { apt: { packages: [bc] } }
 linux_shared: &linux_shared
   os: linux
+  os: linux-ppc64le
   addons: { apt: { packages: [bc] } }
 matrix:
   include:
@@ -31,6 +33,14 @@ matrix:
     osx_image: xcode7
     rvm: default
     env: QUEUE=macstadium6 IMAGE=xcode7
+  - sudo: false
+    dist: xenial
+    env: QUEUE=builds.power.container DIST=xenial
+    <<: *linux_shared
+  - sudo: required
+    dist: xenial
+    env: QUEUE=builds.power DIST=xenial
+    <<: *linux_shared
 before_install:
 - gem update --system
 - gem install bundler

From ab6ae102e9038b52f26199a82b46894d4438ee0c Mon Sep 17 00:00:00 2001
From: ghatwala <ghatwala@us.ibm.com>
Date: Tue, 25 Sep 2018 17:23:06 +0530
Subject: [PATCH 2/3] Update .travis.yml

---
 .travis.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cfa5c3340..8df073eae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 sudo: false
-rvm: 2.4.1
+rvm: 2.5.1
 env:
   global:
   - CHIRP_SUMMARY_OUTPUT="${TRAVIS_BUILD_DIR}/chirp.json"
@@ -8,20 +8,21 @@ env:
   - CHIRP_S3_REPEATS=0
 addons: { apt: { packages: [bc] } }
 linux_shared: &linux_shared
-  os: linux
-  os: linux-ppc64le
   addons: { apt: { packages: [bc] } }
 matrix:
   include:
-  - sudo: false
+  - os: linux
+    sudo: false
     dist: trusty
     env: QUEUE=ec2 DIST=trusty
     <<: *linux_shared
-  - sudo: required
+  - os: linux
+    sudo: required
     dist: trusty
     env: QUEUE=gce DIST=trusty
     <<: *linux_shared
-  - sudo: required
+  - os: linux
+    sudo: required
     dist: xenial
     group: edge
     env: QUEUE=gce DIST=xenial
@@ -33,12 +34,15 @@ matrix:
     osx_image: xcode7
     rvm: default
     env: QUEUE=macstadium6 IMAGE=xcode7
-  - sudo: false
+  - os: linux-ppc64le
+    sudo: false
     dist: xenial
+    rvm: default
     env: QUEUE=builds.power.container DIST=xenial
     <<: *linux_shared
   - sudo: required
     dist: xenial
+    rvm: default
     env: QUEUE=builds.power DIST=xenial
     <<: *linux_shared
 before_install:

From 3dd7ec047d326a3e75e8f618977f179c47da5860 Mon Sep 17 00:00:00 2001
From: ghatwala <ghatwala@us.ibm.com>
Date: Tue, 25 Sep 2018 22:06:26 +0530
Subject: [PATCH 3/3] Update .travis.yml

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8df073eae..5adadd0ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,8 @@ matrix:
     rvm: default
     env: QUEUE=builds.power.container DIST=xenial
     <<: *linux_shared
-  - sudo: required
+  - os: linux-ppc64le
+    sudo: required
     dist: xenial
     rvm: default
     env: QUEUE=builds.power DIST=xenial