Add Jenkinsfile for IBM i builds

Cherry-pick test updates from upstream f4afa50. This ensures that
test.py will return a failing return code when a test fails instead
of giving a false positive.

Author: kadler

IBM_DB/ibm_db/tests.py

@@ -1,57 +1,40 @@
 import os
+from os.path import basename, join
 import sys
 import unittest
-if sys.version_info >= (3, ):
-    from io import StringIO
-else:
-    from cStringIO import StringIO
-import re
 import glob
 import config
+import importlib
 
-class IbmDbTest(unittest.TestCase):
-  
-  slash = '/'
-  
-  # Currently, this function serves no purpose.
-  # However, this function has to be defined if the
-  #   unittest.TestCase is inherited in the given class.
-  # For future reference, this function is called 
-  #   everytime a test is ran in this testsuite.
-  def setUp(self):
-    pass
+# Test runner for ibm_db. Normally one could use something like:
+#
+# Run all in the tests directory:
+#   python -m unittest discover -v -s tests
+#
+# Run all tests matching specified pattern or specific test:
+#   python -m unittest discover -v -s tests -p 'test_*FetchAssocSelect*.py'
+#   python -m unittest discover -v -s tests -p test_006_ConnPassingOpts.py
+#
+# However, for running all the tests, we need to ensure that test_000_PrepareDb
+# is run first to set up the database. Possibly this could be moved to a
+# separate task which is run by itself prior to running any tests, which
+# would simplify things a bit.
 
-  # This function gets a list of all the test files located
-  #   in the current_dir/config.test_dir directory.
-  def getFileList(self):
-    if (sys.platform[0:3] == 'win'):
-      self.slash = '\\'
-    dir = config.test_dir + self.slash
-    if (os.environ.get("SINGLE_PYTHON_TEST", None)):
-      testfile = dir + os.environ.get("SINGLE_PYTHON_TEST", None)
-      filelist = glob.glob(testfile)
-    else:
-      filelist = glob.glob(dir + "test_*.py")
-      
-    for i in range(0, len(filelist)):
-      filelist[i] = filelist[i].replace('.py', '')
-      filelist[i] = filelist[i].replace(config.test_dir + self.slash, '')
-    filelist.sort()
-    return filelist
-
-  # This function is called to run all the tests.
-  def runTest(self):
-    filelist = self.getFileList();
+# Override standard test-loading behavior
+def load_tests(loader, tests, pattern):
     suite = unittest.TestSuite()
 
-    sys.path = [os.path.dirname(os.path.abspath(__file__)) + self.slash + config.test_dir] + sys.path[0:]
+    test_glob = os.environ.get("SINGLE_PYTHON_TEST", "test_*.py")
+    files = glob.glob(join(config.test_dir, test_glob))
+    tests = [ basename(_).replace('.py', '') for _ in files ]
+    tests.sort()
+    
+    for test in tests:
+        mod = importlib.import_module(test)
+        suite.addTest(mod.IbmDbTestCase(test))
 
-    for i in range(0, len(filelist)):
-      exec("import %s" % filelist[i])
-      testFuncName = filelist[i].replace(config.test_dir + self.slash, '')
-      exec("suite.addTest(%s.IbmDbTestCase(testFuncName))" % filelist[i])
-      
-    unittest.TextTestRunner(verbosity=2).run(suite) 
+    return suite
 
-obj = IbmDbTest()
-suite = obj.runTest()
+if __name__ == '__main__':
+    sys.path.insert(0, config.test_dir)
+    unittest.main(verbosity=2)

Jenkinsfile

@@ -0,0 +1,44 @@
+pipeline {
+  agent {
+    node {
+      label 'ibmi'
+    }
+  }
+
+  environment {
+//     OBJECT_MODE = '64'
+//     CC = 'gcc'
+//     CXX = 'g++'
+    CFLAGS="-DPASE"
+  }
+
+  stages {
+    stage('setup') {
+      steps {
+        dir("IBM_DB/ibm_db") {
+          sh 'python3 -m venv --clear .venv'
+        }
+      }
+    }
+
+    stage('build') {
+      steps {
+        dir("IBM_DB/ibm_db") {
+          sh '. .venv/bin/activate; pip install .'
+        }
+      }
+    }
+
+    stage('test') {
+      environment {
+        DATABASE = credentials('database-creds')
+      }
+      steps {
+        dir("IBM_DB/ibm_db") {
+          sh label: 'setting up config', script:"perl -p -e \"s|sample|*LOCAL|; s|db2inst1|$DATABASE_USR|; s|'password'|'$DATABASE_PSW'|; \" config.py.sample > config.py"
+          sh '. .venv/bin/activate; python tests.py'
+        }
+      }
+    }
+  }
+}