Commit ceeec64c authored by Fabien Combernous's avatar Fabien Combernous

Merge branch '38-add-more-cpu-to-suts-master-and-slace' into 'master'

Resolve "add more cpu to SUTs master and slave"

Closes #38

See merge request adullact/puppet-freeipa!42
parents 3f5b8efd 0a8b424e
......@@ -23,9 +23,6 @@ syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore c
- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
variables:
PUPPET_GEM_VERSION: '~> 5.5'
tags:
- fast
- executor-docker
parallel_spec-Ruby 2.5.1-Puppet ~> 5.5:
stage: unit
......@@ -34,9 +31,6 @@ parallel_spec-Ruby 2.5.1-Puppet ~> 5.5:
- bundle exec rake parallel_spec
variables:
PUPPET_GEM_VERSION: '~> 5.5'
tags:
- fast
- executor-docker
acceptance with puppet5:
stage: acceptance
......@@ -50,7 +44,5 @@ acceptance with puppet5:
- bundle exec rake beaker:default
tags:
- puppet-tests
- executor-shell
- fast
except:
- master
......@@ -10,8 +10,8 @@ HOSTS:
box: centos/7
box_version: 1809.01
box_check_update: false
vagrant_memsize: 4048
vagrant_cpus: 4
vagrant_memsize: 2048
vagrant_cpus: 2
ip: 192.168.44.35
ipa-server-2:
roles:
......@@ -22,7 +22,7 @@ HOSTS:
box: centos/7
box_version: 1809.01
box_check_update: false
vagrant_memsize: 4048
vagrant_memsize: 2048
vagrant_cpus: 2
ip: 192.168.44.36
ipa-client-centos:
......@@ -35,7 +35,7 @@ HOSTS:
box: centos/7
box_version: 1809.01
box_check_update: false
vagrant_memsize: 2024
vagrant_memsize: 1024
ip: 192.168.44.37
ipa-client-ubuntu16:
roles:
......@@ -46,7 +46,7 @@ HOSTS:
box: ubuntu/xenial64
box_version: 20181114.0.0
box_check_update: false
vagrant_memsize: 2024
vagrant_memsize: 1024
ip: 192.168.44.38
CONFIG:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment