Revert "Modify test conditions in generate cookiecutter"
This reverts commit 65a7c899714329beaf6610275e82eb09d142c351.
Change-Id: I49041130c1eeacc4e40a9a2b22e26dd1cbcc4312
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 766989b..b41bb5f 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -85,7 +85,7 @@
}
stage("Test") {
- if (!env.BUILD_USER_ID.contains("jenkins") && RECLASS_MODEL_URL == "" && TEST_MODEL && TEST_MODEL.toBoolean()) {
+ if (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)