commit 65a7c899714329beaf6610275e82eb09d142c351
author chnyda <chnyda@mirantis.com> Thu Jun 08 10:34:47 2017 +0200
committer chnyda <chnyda@mirantis.com> Thu Jun 08 10:34:47 2017 +0200
tree 23f4a6d8ae05af27758d51b744878524fa0dd8f7
parent c0bffaef804437c3c298b871ff159bf42f19d390

Modify test conditions in generate cookiecutter

Change-Id: I7dc933062c8e687827e24dd5fdf1ae3e36dc2b28

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index b41bb5f..766989b 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -85,7 +85,7 @@
             }
 
             stage("Test") {
-                if (RECLASS_MODEL_URL == "" && TEST_MODEL && TEST_MODEL.toBoolean()) {
+                if (!env.BUILD_USER_ID.contains("jenkins") && RECLASS_MODEL_URL == "" && TEST_MODEL && TEST_MODEL.toBoolean()) {
                     sh("cp -r ${modelEnv} ${testEnv}")
                     def defaultReclassModel = "ssh://jenkins-mk@gerrit.mcp.mirantis.net:29418/salt-models/reclass-system"
                     git.checkoutGitRepository("${testEnv}/classes/system", defaultReclassModel, RECLASS_MODEL_BRANCH, RECLASS_MODEL_CREDENTIALS)