Merge "Fix rubyVersion parsing"
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 1fc38b3..fe85d37 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -184,7 +184,8 @@
'reclassEnv' : testEnv,
'distribRevision' : distribRevision,
'dockerContainerName': DockerCName,
- 'testContext' : 'salt-model-node'
+ 'testContext' : 'salt-model-node',
+ 'dockerExtraOpts' : [ '--memory=3g' ]
]
testResult = saltModelTesting.testNode(config)
common.infoMsg("Test finished: SUCCESS")
diff --git a/test-cookiecutter-reclass-chunk.groovy b/test-cookiecutter-reclass-chunk.groovy
index 8fe0a2b..e0c9710 100644
--- a/test-cookiecutter-reclass-chunk.groovy
+++ b/test-cookiecutter-reclass-chunk.groovy
@@ -33,7 +33,8 @@
'reclassEnv': extraVars.testReclassEnv,
'distribRevision': extraVars.DISTRIB_REVISION,
'dockerContainerName': extraVars.DockerCName,
- 'testContext': extraVars.modelFile
+ 'testContext': extraVars.modelFile,
+ 'dockerExtraOpts': [ '--memory=3g' ]
]
if (extraVars.useExtraRepos) {
config['extraRepos'] = extraVars.extraRepos ? extraVars.extraRepos : [:]
diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index b9c0356..154df3d 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -73,6 +73,7 @@
'reclassEnv': workspace,
'distribRevision': distribRevision,
'dockerMaxCpus': MAX_CPU_PER_JOB.toInteger(),
+ 'dockerExtraOpts': [ '--memory=3g' ],
'ignoreClassNotfound': RECLASS_IGNORE_CLASS_NOTFOUND,
'aptRepoUrl': APT_REPOSITORY,
'aptRepoGPG': APT_REPOSITORY_GPG,