Several beaker-related fixes from #104

puppetlabs · Aug 14, 2018 · 8c28f32 · 8c28f32
1 parent 33eae4a
commit 8c28f32
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/moduleroot/.gitlab-ci.yml.erb b/moduleroot/.gitlab-ci.yml.erb
@@ -14,7 +14,7 @@ stages:
   - unit
 <% end -%>
 <% if configs['beaker'] -%>
-  - acceptance
+  - beaker
 <% end -%>
 <% if configs['custom_stages'] -%>
 <%   configs['custom_stages'].each do |stage| -%>
@@ -24,7 +24,7 @@ stages:
 <% if configs.has_key?('global_variables') -%>
 variables:
 <%   configs['global_variables'].each do |key, value| -%>
-  <%= key %>: '<%= value %>''
+  <%= key %>: '<%= value %>'
 <%   end -%>
 <% end -%>
 
@@ -73,17 +73,17 @@ before_script:
 <%   end -%>
 <% end -%>
 <% if configs['beaker'] -%>
-acceptance:
-  stage: acceptance
+beaker:
+  stage: beaker
   variables:
-    DOCKER_DRIVER: overlay2
+    DOCKER_DRIVER: 'overlay2'
 <%   configs['beaker']['variables'].each do |key, value| -%>
-    <%= key %>: <%= value %>
+    <%= key %>: '<%= value %>'
 <%   end -%>
   services:
     - docker:dind
   script:
-    - bundle install
+    - bundle install --with-system_tests
     - bundle exec rake acceptance
 <%   if configs['beaker']['tags'] -%>
   tags: