Merge pull request #299 from rodjek/lukebigum-master

Boolean to remove the before_script section in .gitlab-ci.yml

README.md

@@ -61,6 +61,7 @@ Gitlab CI uses a .gitlab-ci.yml file in the root of your repository tell Gitlab
 | rubygems_mirror | Use a custom rubygems mirror url |
 | image          |Define the Docker image to use, when using the Docker runner. Please see the [Using Docker images](https://docs.gitlab.com/ee/ci/docker/using_docker_images.html) docs for specifics.|
 | custom_before_steps |Allows you to pass additional steps to the GitLab CI before_script. Please see the [.gitlab-ci.yml](https://docs.gitlab.com/ce/ci/yaml/#before_script-and-after_script) docs for specifics.|
+| default_before_script  |If false, removes the default `before_script` section. Useful if you need a customised Bundler install, or to remove Bundler entirely. If the key is unset the default behaviour is to add `before_script`.|
 
 ### .pdkignore
 

config_defaults.yml

@@ -608,6 +608,7 @@ Gemfile:
           - parallel_spec
         puppet_version: '~> 5'
     # beaker: true
+    default_before_script: true
 spec/default_facts.yml:
   ipaddress: "172.16.254.254"
   ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"

moduleroot/.gitlab-ci.yml.erb

@@ -41,6 +41,7 @@ cache:
 <%   end -%>
 <% end -%>
 
+<% if !configs.has_key?('default_before_script') || configs['default_before_script'] -%>
 before_script:
 <% if configs['custom_before_steps'] -%>
 <%   configs['custom_before_steps'].each do |step| -%>
@@ -58,6 +59,7 @@ before_script:
   - gem --version
   - bundle -v
   - bundle install <%= configs['bundler_args'] %>
+<% end -%>
 
 <% if configs['ruby_versions'] -%>
 <%   configs['ruby_versions'].each do |ruby_version, options| -%>