отдельно выделяю папки и артефакты по ОФ-части tdd и дымовых

BullJeep · Mar 2, 2019 · cf97233 · cf97233
2 parents d6ab376 + 416b85b
commit cf97233
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/tasks/init.os b/tasks/init.os
@@ -79,11 +79,17 @@
 	СоздатьКаталог("./build/ServiceBases/allurereport/");
 	СоздатьКаталог("./build/ServiceBases/junitreport/");
 	СоздатьКаталог("./build/ServiceBases/cucumber/");
+
 	СоздатьКаталог("./build/allure");
 	СоздатьКаталог("./build/allure-tdd");
 	СоздатьКаталог("./build/junit-smoke");
 	СоздатьКаталог("./build/junit-tdd");
 
+	СоздатьКаталог("./build/allure-ordinaryapp");
+	СоздатьКаталог("./build/allure-tdd-ordinaryapp");
+	СоздатьКаталог("./build/junit-smoke-ordinaryapp");
+	СоздатьКаталог("./build/junit-tdd-ordinaryapp");
+
 	Если Аргументы.Команда = ВозможныеКоманды.file Тогда
 
 		Лог.Информация("Создание основной файловой базы - runner init-dev");

diff --git a/tools/jenkins/Jenkinsfile-fast b/tools/jenkins/Jenkinsfile-fast
@@ -149,6 +149,9 @@ node("slave") {
         }
     }
     makeJunit("build/junit-smoke", "*.xml")
+    prepareForAllure("build/allure/", 'allure-smoke', allureResults)
+
+    reportKey = "--reportsxunit \"ГенераторОтчетаJUnitXML{build/junit-smoke-ordinaryapp/junit.xml};ГенераторОтчетаAllureXMLВерсия2{build/allure-ordinaryapp/allure.xml}\" "
     timestamps {
         timeout(15){
             try{
@@ -159,10 +162,10 @@ node("slave") {
         }
     }
     showErrors(errors)
-    makeJunit("build/junit-smoke", "*.xml")
+    makeJunit("build/junit-smoke-ordinaryapp", "*.xml")
     // makeAllure([[path:"build/allure"]])
     // allureResults << [path : "build/allure"]
-    prepareForAllure("build/allure/", 'allure-smoke', allureResults)
+    prepareForAllure("build/allure-ordinaryapp/", 'allure-smoke-ordinaryapp', allureResults)
   }
 
   stage('TDD Тестирование') {
@@ -179,6 +182,9 @@ node("slave") {
         }
     }
     makeJunit("build/junit-tdd", "*.xml")
+    prepareForAllure("build/allure-tdd/", 'allure-tdd', allureResults)
+
+    reportKey = "--reportsxunit \"ГенераторОтчетаJUnitXML{build/junit-tdd-ordinaryapp/junit-tdd.xml};ГенераторОтчетаAllureXMLВерсия2{build/allure-tdd-ordinaryapp/allure.xml}\" "
     timeout(15){
         timestamps {
             try{
@@ -189,16 +195,16 @@ node("slave") {
         }
     }
     showErrors(errors)
-    makeJunit("build/junit-tdd", "*.xml")
+    makeJunit("build/junit-tdd-ordinaryapp", "*.xml")
     // makeAllure([[path:"build/allure-tdd"]])
-    prepareForAllure("build/allure-tdd/", 'allure-tdd', allureResults)
+    prepareForAllure("build/allure-tdd-ordinaryapp/", 'allure-tdd-ordinaryapp', allureResults)
   }
 
   stage('BDD тестирование (библиотеки)'){
     def buildKey = "8310UF";
     def buildPath = "libraries";
 
-    def command = "vrunner vanessa --settings tools/JSON/vrunner.json  --path features/${buildPath}";
+    def command = "vrunner vanessa --settings tools/JSON/vrunner.json --path features/${buildPath}";
 
     def errors = []
     timeout(15){
@@ -291,8 +297,9 @@ node("slave") {
 
             makeArtifacts('**/ServiceBases/**/junitreport/**')
             makeArtifacts('**/ServiceBases/**/allurereport/**')
-            makeArtifacts('**/build/junit-tdd/*.xml')
-            makeArtifacts('**/build/junit-smoke/*.xml')
+            makeArtifacts('**/build/junit-tdd*/*.xml')
+            makeArtifacts('**/build/junit-smoke*/*.xml')
+            makeArtifacts('**/build/allure*/**/*.xml')
             makeArtifacts('**/build/**/*.txt')
             makeArtifacts('**/build/**/*.xml')
         }