Merge pull request #517 from cloudant/jenkinsfile-matrix

Moved matrix testing into Jenkinsfile

Author: ricellis

Jenkinsfile

@@ -14,60 +14,104 @@
  * and limitations under the License.
  */
 
+def runTests(testEnv, isAndroid) {
+    node(isAndroid ? 'android' : null) {
+        if (isAndroid) {
+            // Android tests run on static hardware so clean the dir
+            deleteDir()
+            testEnv.add('GRADLE_TARGET=-b AndroidTest/build.gradle uploadFixtures connectedCheck')
+        } else {
+            testEnv.add('GRADLE_TARGET=integrationTest')
+        }
+        // Unstash the built content
+        unstash name: 'built'
+
+        //Set up the environment and run the tests
+        withEnv(testEnv) {
+            withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: env.CREDS_ID, usernameVariable: 'DB_USER', passwordVariable: 'DB_PASSWORD']]) {
+                try {
+                    sh './gradlew -Dtest.with.specified.couch=true -Dtest.couch.username=$DB_USER -Dtest.couch.password=$DB_PASSWORD -Dtest.couch.host=$DB_HOST -Dtest.couch.port=$DB_PORT -Dtest.couch.http=$DB_HTTP -Dtest.couch.ignore.compaction=$DB_IGNORE_COMPACTION -Dtest.couch.ignore.auth.headers=true $GRADLE_TARGET'
+                } finally {
+                    junit '**/build/**/*.xml'
+                    if (isAndroid) {
+                        // Collect the device log
+                        archiveArtifacts artifacts: '**/build/**/*.log'
+                    }
+                }
+            }
+        }
+    }
+}
+
 stage('Build') {
     // Checkout, build and assemble the source and doc
     node {
         checkout([
-            $class: 'GitSCM',
-            branches: scm.branches,
-            doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
-            extensions: scm.extensions + [[$class: 'CleanBeforeCheckout']],
-            userRemoteConfigs: scm.userRemoteConfigs
+                $class                           : 'GitSCM',
+                branches                         : scm.branches,
+                doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+                extensions                       : scm.extensions + [[$class: 'CleanBeforeCheckout']],
+                userRemoteConfigs                : scm.userRemoteConfigs
         ])
         sh './gradlew clean assemble'
         stash name: 'built'
     }
 }
 
 stage('QA') {
-    parallel(
-        Java:
-        {
-            node {
-                unstash name: 'built'
-                // findBugs
-                try {
-                    sh './gradlew -Dfindbugs.xml.report=true findbugsMain'
-                } finally {
-                    step([$class: 'FindBugsPublisher', pattern: '**/build/reports/findbugs/*.xml'])
-                }
-                // tests
-                withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'clientlibs-test', usernameVariable: 'DB_USER', passwordVariable: 'DB_PASSWORD']]) {
+    // Define the matrix environments
+    def CLOUDANT_ENV = ['DB_HTTP=https', 'DB_HOST=clientlibs-test.cloudant.com', 'DB_PORT=443', 'DB_IGNORE_COMPACTION=true', 'CREDS_ID=clientlibs-test']
+    def COUCH1_6_ENV = ['DB_HTTP=http', 'DB_HOST=cloudantsync002.bristol.uk.ibm.com', 'DB_PORT=5984', 'DB_IGNORE_COMPACTION=false', 'CREDS_ID=couchdb']
+    def COUCH2_0_ENV = ['DB_HTTP=http', 'DB_HOST=cloudantsync002.bristol.uk.ibm.com', 'DB_PORT=5985', 'DB_IGNORE_COMPACTION=true', 'CREDS_ID=couchdb']
+    def CLOUDANT_LOCAL_ENV = ['DB_HTTP=http', 'DB_HOST=cloudantsync002.bristol.uk.ibm.com', 'DB_PORT=8081', 'DB_IGNORE_COMPACTION=true', 'CREDS_ID=couchdb']
+
+    // Standard builds do Findbugs and test sync-android for Android and Java against Cloudant
+    def axes = [
+            Findbugs        : {
+                node {
+                    unstash name: 'built'
+                    // findBugs
                     try {
-                        sh './gradlew -Dtest.with.specified.couch=true  -Dtest.couch.username=$DB_USER -Dtest.couch.password=$DB_PASSWORD -Dtest.couch.host=clientlibs-test.cloudant.com -Dtest.couch.port=443 -Dtest.couch.http=https -Dtest.couch.ignore.compaction=true -Dtest.couch.ignore.auth.headers=true integrationTest'
+                        sh './gradlew -Dfindbugs.xml.report=true findbugsMain'
                     } finally {
-                        junit '**/build/test-results/*.xml'
+                        step([$class: 'FindBugsPublisher', pattern: '**/build/reports/findbugs/*.xml'])
                     }
                 }
+            },
+            Java_Cloudant   : {
+                runTests(CLOUDANT_ENV, false)
+            },
+            Android_Cloudant: {
+                runTests(CLOUDANT_ENV, true)
             }
-        },
-        Android:
-        {
-            node('android') {
-                // Clean the directory before un-stashing
-                deleteDir()
-                unstash name: 'built'
-                withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'couchdb', usernameVariable: 'DB_USER', passwordVariable: 'DB_PASSWORD']]) {
-                    try {
-                        sh './gradlew -Dtest.with.specified.couch=true  -Dtest.couch.username=$DB_USER -Dtest.couch.password=$DB_PASSWORD -Dtest.couch.host=cloudantsync002.bristol.uk.ibm.com -Dtest.couch.port=5984 -Dtest.couch.ignore.compaction=true -Dtest.couch.ignore.auth.headers=true -b AndroidTest/build.gradle uploadFixtures connectedCheck'
-                    } finally {
-                    junit '**/build/**/*.xml'
-                        archiveArtifacts artifacts: '**/build/**/*.log'
-                    }
+    ]
+    // For the master branch, add additional axes to the coverage matrix for Couch 1.6, 2.0
+    // and Cloudant Local
+    if (env.BRANCH_NAME == "master") {
+        axes.putAll(
+                Java_Couch1_6: {
+                    runTests(COUCH1_6_ENV, false)
+                },
+                Android_Couch1_6: {
+                    runTests(COUCH1_6_ENV, true)
+                },
+                Java_Couch2_0: {
+                    runTests(COUCH2_0_ENV, false)
+                },
+                Android_Couch2_0: {
+                    runTests(COUCH2_0_ENV, true)
+                },
+                Java_CloudantLocal: {
+                    runTests(CLOUDANT_LOCAL_ENV, false)
+                },
+                Android_CloudantLocal: {
+                    runTests(CLOUDANT_LOCAL_ENV, true)
                 }
-            }
-        }
-    )
+        )
+    }
+
+    // Run the required axes in parallel
+    parallel(axes)
 }
 
 // Publish the master branch