From c0ce3af4ddd69a4f1b99dacacf5e547af2dd8281 Mon Sep 17 00:00:00 2001
From: lnemsick-simp <lnemsick-simp@users.noreply.github.com>
Date: Fri, 16 Nov 2018 10:36:46 -0500
Subject: [PATCH] (SIMP-MAINT) Test ad suite in FIPS mode (#69)

- Update to version of simp-beaker-helpers that doesn't try to
  enble FIPS on Windows boxes
- Add GitLab job
---
 .gitlab-ci.yml | 10 ++++++++++
 .travis.yml    |  2 +-
 Gemfile        |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da28dda..c34126a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -220,6 +220,16 @@ pup5.5.7-ad:
     - 'bundle exec rake beaker:suites[ad]'
   retry: 1
 
+pup5.5.7-ad-fips:
+  <<: *pup_5_5_7
+  <<: *acceptance_base
+  script:
+    - 'bundle exec rake spec_clean'
+    - 'BEAKER_fips=yes bundle exec rake beaker:suites[ad]'
+  retry: 1
+
+pup5.5.7-oel:
+
 pup5.5.7-oel:
   <<: *pup_5_5_7
   <<: *acceptance_base
diff --git a/.travis.yml b/.travis.yml
index d40cc15..6b94d1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ stages:
   - check
   - spec
   - name: deploy
-    if: 'fork = false AND tag = true'
+    if: 'tag IS present'
 
 bundler_args: --without development system_tests --path .vendor
 
diff --git a/Gemfile b/Gemfile
index 1b82770..256e505 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,5 +29,5 @@ group :system_tests do
   gem 'beaker'
   gem 'beaker-rspec'
   gem 'beaker-windows'
-  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.12')
+  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.13')
 end