Removes puppet 6 from .gitlab-ci.yml

.gitlab-ci.yml

@@ -340,6 +340,7 @@ pup7.pe-unit:
   <<: *pup_7_pe
   <<: *unit_tests
 
+
 # Commenting until Puppet 8 is released
 #pup8.x-unit:
 #  <<: *pup_8_x
@@ -379,8 +380,8 @@ pup7.pe-oel:
   script:
     - 'bundle exec rake beaker:suites[default,oel]'
 
-pup8.x:
-  <<: *pup_8_x
-  <<: *acceptance_base
-  script:
-    - 'bundle exec rake beaker:suites[default]'
+#pup8.x:
+#  <<: *pup_8_x
+#  <<: *acceptance_base
+#  script:
+#    - 'bundle exec rake beaker:suites[default]'

spec/acceptance/nodesets/oel.yml

@@ -1,31 +1,24 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   oel7:
     roles:
-      - server7
-      - default
+    - server7
+    - default
     platform: el-7-x86_64
-    box :     generic/oracle7
-    hypervisor : <%= hypervisor %>
-
+    box: generic/oracle7
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: sicura-image-build/oracle-linux-7
+    gce_machine_type: n1-standard-2
   oel8:
     roles:
-      - server8
+    - server8
     platform: el-8-x86_64
-    box :     generic/oracle8
-    hypervisor : <%= hypervisor %>
-
+    box: generic/oracle8
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: sicura-image-build/oracle-linux-8
+    gce_machine_type: n1-standard-2
 CONFIG:
   type: aio
   log_level: verbose
   vagrant_memsize: 256
-  log_level: verbose
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"