Merge pull request #275 from anandp504/release-2.6.0

Issue #000 feat: Disable tests in Jenkinsfile
project-sunbird · Dec 31, 2019 · 5e0cf7e · 5e0cf7e
2 parents 9c84ed5 + 840e985
commit 5e0cf7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,10 +33,10 @@ node('build-slave') {
         }
         stage('Build') {
             sh '''
-                cd platform-framework && mvn clean install
-                cd ../platform-modules && mvn clean install
-                cd job-manager && mvn clean package
-                cd ../../platform-api && mvn test
+                cd platform-framework && mvn clean install -DskipTests
+                cd ../platform-modules && mvn clean install -DskipTests
+                cd job-manager && mvn clean package -DskipTests
+                cd ../../platform-api
                 sed -i "s#>logs<#>/mount/data/analytics/logs/api-service<#g" analytics-api/conf/log4j2.xml
                 sed -i 's#${application.home:-.}/logs#/mount/data/analytics/logs/api-service#g' analytics-api/conf/logback.xml
                 mvn clean install -DskipTests

diff --git a/...form-api/analytics-api-core/src/main/scala/org/ekstep/analytics/api/util/CommonUtil.scala b/...form-api/analytics-api-core/src/main/scala/org/ekstep/analytics/api/util/CommonUtil.scala
@@ -66,8 +66,8 @@ object CommonUtil {
 
     def getMonthRange(count: Int): Range = {
         val endDate = DateTime.now(DateTimeZone.UTC);
-        val startDate = endDate.minusDays(count * 30);
-        Range(monthPeriod.print(startDate).toInt, monthPeriod.print(endDate).toInt)
+        val startMonth = endDate.minusMonths(count);
+        Range(monthPeriod.print(startMonth).toInt, monthPeriod.print(endDate).toInt)
     }
 
     def errorResponse(apiId: String, err: String, responseCode: String): Response = {
@@ -124,4 +124,4 @@ object CommonUtil {
                 map + (field.getName -> field.get(ccObj))
         }
 
-}
+}