Attempt to add freebsd back to the mix

1 files changed, 10 insertions, 27 deletions

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 5920fb960..75e77af2d 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -59,6 +59,8 @@ platform_images = [
   'bullseye': "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}"
 ]
 
+gnu_make = ['freebsd': 'gmake', 'macos': 'make']
+
 pipeline {
 
   // no top-level agent; agents must be declared for each stage
@@ -134,7 +136,7 @@ pipeline {
         axes {
           axis {
             name 'platform'
-            values 'macos', 'centos7', 'centos8', 'bionic', 'focal', 'stretch', 'buster', 'bullseye'
+            values 'freebsd', 'macos', 'centos7', 'centos8', 'bionic', 'focal', 'stretch', 'buster', 'bullseye'
           }
           axis {
             name 'spidermonkey'
@@ -145,7 +147,7 @@ pipeline {
           exclude {
             axis {
               name 'platform'
-              values 'centos7', 'bionic', 'stretch'
+              values 'centos7', 'bionic', 'stretch', 'freebsd'
             }
             axis {
               name 'spidermonkey'
@@ -207,40 +209,21 @@ pipeline {
               // deleteDir is OK here because we're not inside of a Docker container!
               deleteDir()
               unstash 'tarball'
-              withEnv(['HOME='+pwd(), 'PATH+USRLOCAL=/usr/local/bin']) {
+              withEnv(['HOME='+pwd(), 'PATH+USRLOCAL=/usr/local/bin', 'MAKE='+gnu_make[env.platform]]) {
                 sh( script: unpack, label: 'Unpack tarball' )
                 dir( "${platform}/build/couchdb" ) {
                   sh 'pwd'
                   sh 'ls -l'
                   sh "./configure --skip-deps --spidermonkey-version ${spidermonkey}"
-                  sh 'make'
-                  sh 'make eunit'
-                  sh 'make elixir-suite'
-                  sh 'make exunit'
-                  sh 'make mango-test'
+                  sh '$MAKE'
+                  sh '$MAKE eunit'
+                  sh '$MAKE elixir-suite'
+                  sh '$MAKE exunit'
+                  sh '$MAKE mango-test'
                 }
               }
             }
 
-              // withEnv(['HOME='+pwd()]) {
-              //   sh '''
-              //     PATH=/usr/local/bin:$PATH
-              //     export PATH
-              //     mkdir -p $COUCHDB_IO_LOG_DIR
-
-              //     # Build CouchDB from tarball & test
-              //     mkdir build
-              //     cd build
-              //     tar -xzf $WORKSPACE/apache-couchdb-*.tar.gz
-              //     cd apache-couchdb-*
-              //     ./configure --spidermonkey-version ${sm_ver}
-              //     make check || (build-aux/logfile-uploader.py && false)
-
-              //     # No package build for non-containerized platforms at this time
-              //   '''
-              // } // withEnv
-            // } // steps
-
             post {
               always {
                 junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'