Fix AAR size not being reported correctly (#5875)

realm · Apr 9, 2018 · 6c6b625 · 6c6b625
1 parent 8d37b06
commit 6c6b625
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -27,10 +27,10 @@ try {
         // A full build is done on `master`.
         // TODO Once Android emulators are available on all nodes, we can switch to x86 builds
         // on PR's for even more throughput.
-        def ABIs = ""
+        def abiFilter = ""
         def instrumentationTestTarget = "connectedAndroidTest"
         if (!['master', 'next-major'].contains(env.BRANCH_NAME)) {
-            ABIs = "armeabi-v7a"
+            abiFilter = "-PbuildTargetABIs=armeabi-v7a"
             instrumentationTestTarget = "connectedObjectServerDebugAndroidTest" // Run in debug more for better error reporting
         }
 
@@ -60,7 +60,7 @@ try {
                 stage('JVM tests') {
                   try {
                     withCredentials([[$class: 'FileBinding', credentialsId: 'c0cc8f9e-c3f1-4e22-b22f-6568392e26ae', variable: 'S3CFG']]) {
-                      sh "chmod +x gradlew && ./gradlew assemble check javadoc -Ps3cfg=${env.S3CFG} -PbuildTargetABIs=${ABIs}"
+                      sh "chmod +x gradlew && ./gradlew assemble check javadoc -Ps3cfg=${env.S3CFG} ${abiFilter}"
                     }
                   } finally {
                     storeJunitResults 'realm/realm-annotations-processor/build/test-results/test/TEST-*.xml'
@@ -87,7 +87,7 @@ try {
 
                 stage('Static code analysis') {
                   try {
-                    gradle('realm', 'findbugs pmd checkstyle -PbuildTargetABIs=${ABIs}')
+                    gradle('realm', "findbugs pmd checkstyle ${abiFilter}")
                   } finally {
                     publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: false, keepAll: true, reportDir: 'realm/realm-library/build/findbugs', reportFiles: 'findbugs-output.html', reportName: 'Findbugs issues'])
                     publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: false, keepAll: true, reportDir: 'realm/realm-library/build/reports/pmd', reportFiles: 'pmd.html', reportName: 'PMD Issues'])
@@ -122,7 +122,7 @@ try {
                   stage('Collect metrics') {
                     collectAarMetrics()
                   }
-                }   
+                }
 
                 if (['master', 'next-major'].contains(env.BRANCH_NAME)) {
                   stage('Publish to OJO') {