From dc25d9e6313d9dd14fcb51c8a9854cb40b31958c Mon Sep 17 00:00:00 2001
From: Spencer McElmurry <mcelmurs@gmail.com>
Date: Wed, 4 Oct 2017 15:35:19 -0700
Subject: [PATCH 1/2] (QENG-5344) Add beaker-abs for ci.next-i-fication

This is needed in order to work with always be scheduling on
CI.Next jenkins instances.
---
 Gemfile  | 1 +
 Rakefile | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 69c8cc8..8c2bd55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ group :acceptance do
   gem 'beaker', '< 3.0'
   gem 'beaker-rspec'
   gem 'beaker-hostgenerator'
+  gem 'beaker-abs'
 end
 
 group :development do
diff --git a/Rakefile b/Rakefile
index 6abf750..b4adc98 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,6 +23,7 @@ task :acceptance do
 
   install_type = 'aio'
   target = ENV['platform']
+  abs = if ENV['BEAKER_ABS'] then 'abs' else 'vmpooler' end
   if ! target
     STDERR.puts 'TEST_TARGET environment variable is not set'
     STDERR.puts 'setting to default value of "centos7-64ma".'
@@ -34,7 +35,7 @@ task :acceptance do
     target += "{type=#{install_type}}"
   end
 
-  cli = BeakerHostGenerator::CLI.new([target])
+  cli = BeakerHostGenerator::CLI.new([target, '--hypervisor', abs])
   nodeset_dir = 'spec/acceptance/nodesets'
   nodeset = "#{nodeset_dir}/#{target}.yml"
   FileUtils.mkdir_p(nodeset_dir)

From ffd05a36085f1bd023cbc7ffb866892a77f46314 Mon Sep 17 00:00:00 2001
From: Jesse Scott <jesse@puppetlabs.com>
Date: Fri, 13 Oct 2017 10:35:14 -0700
Subject: [PATCH 2/2] (fixup) Update bundler before Travis runs

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

diff --git a/.travis.yml b/.travis.yml
index bcca799..88a4e09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ bundler_args: --without development acceptance
 notifications:
   email: false
 
+before_install:
+  - gem update bundler
+
 matrix:
   fast_finish: true
   include: