Implement pipeline support for TAZ unit tests (IBM#561)

* Implement pipeline support for TAZ unit tests * Remove zUnit support Signed-off-by: Dennis Behm <[email protected]> Co-authored-by: Mathieu Dalbin <[email protected]>
dennis-behm · Nov 8, 2024 · 746fba0 · 746fba0
1 parent 12b85fe
commit 746fba0
Show file tree

Hide file tree

Showing 23 changed files with 236 additions and 249 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -18,3 +18,6 @@
 *.mac zos-working-tree-encoding=ibm-1047 git-encoding=utf-8
 *.json zos-working-tree-encoding=utf-8 git-encoding=utf-8
 *.yaml zos-working-tree-encoding=utf-8 git-encoding=utf-8
+
+# TAZ recording file
+*.rec binary
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ The zAppBuild sample provides the following *language* build scripts by default:
 * DBDgen.groovy
 * PSBgen.groovy
 * MFS.groovy
-* ZunitConfig.groovy
+* TazUnitTest.groovy
 * CRB.groovy
 * Transfer.groovy (for transport non-buildable files like JCL or PROC into build libraries and register them as build output)
 * Easytrieve.groovy

diff --git a/build-conf/README.md b/build-conf/README.md
@@ -30,7 +30,7 @@ SCSQLOAD | MQ Load Library. Example: CSQ.V9R1M0.SCSQLOAD
 SDSNLOAD | DB2 Load Library. Example: DB2.V9R1M0.SDSNLOAD
 SDSNEXIT | DB2 Exit Library. Example: DBC0CFG.SDSNEXIT
 SFELLOAD | Optional IDz Load Library. Example: FEL.V14R0M0.SFELLOAD
-SBZUSAMP | Optional z/OS Dynamic Test Runner IDz zUnit / WAZI VTP library containing necessary copybooks. Example : FEL.V14R2.SBZUSAMP
+SEQASAMP | Optional IBM Debug Tool library containing necessary TAZ copybooks. Example : DEBUG.V16.SEQASAMP
 EZETLOAD | Easytrieve Load Library. Example for IBM Migration Utility: SYS1.SFSYLOAD
 
 ### build.properties
@@ -284,21 +284,21 @@ acbgen_outputDatasets | List of output datasets to document deletions ** Can be
 acbgen_pgm | MVS program name of the acbgen pgm
 acbgen_deployType | Deploy Type of build outputs
 
-### ZunitConfig.properties
-Build properties used by zAppBuild/language/ZunitConfig.groovy
+### TazUnitTest.properties
+Build properties used by zAppBuild/language/TazUnitTest.groovy
 
 Property | Description
 --- | ---
-zunit_bzucfgPDS | Dataset to move BZUCFG files to from USS
-zunit_bzureportPDS | Dataset where BZUCRPT files are stored
-zunit_bzuplayPDS | Dataset to move zUnit Playback files to from USS
-zunit_srcDatasets | Comma separated list of 'source' type data sets
-zunit_srcOptions | BPXWDYN creation options for creating 'source' type data sets
-zunit_loadDatasets | Comma separated list of 'load module' type data sets
-zunit_loadOptions | BPXWDYN creation options for creating 'load module' type data sets
-zunit_reportDatasets | Comma separated list of 'report' type data sets
-zunit_reportOptions | BPXWDYN creation options for creating 'report' type data sets
-zunit_dependenciesDatasetMapping | DBB property mapping to map dependencies to different target datasets
+tazunittest_bzucfgPDS | Dataset to move BZUCFG files to from USS
+tazunittest_bzureportPDS | Dataset where BZUCRPT files are stored
+tazunittest_bzuplayPDS | Dataset to move zUnit Playback files to from USS
+tazunittest_srcDatasets | Comma separated list of 'source' type data sets
+tazunittest_srcOptions | BPXWDYN creation options for creating 'source' type data sets
+tazunittest_loadDatasets | Comma separated list of 'load module' type data sets
+tazunittest_loadOptions | BPXWDYN creation options for creating 'load module' type data sets
+tazunittest_reportDatasets | Comma separated list of 'report' type data sets
+tazunittest_reportOptions | BPXWDYN creation options for creating 'report' type data sets
+tazunittest_dependenciesDatasetMapping | DBB property mapping to map dependencies to different target datasets
 
 ### zCEE3.properties
 Application properties used by zAppBuild/language/zCEE3.groovy

diff --git a/build-conf/TazUnitTest.properties b/build-conf/TazUnitTest.properties
@@ -0,0 +1,33 @@
+# Releng properties used by language/TazUnitTest.groovy
+
+tazunittest_requiredBuildProperties=tazunittest_srcDatasets,tazunittest_loadDatasets,tazunittest_reportDatasets,tazunittest_bzucfgPDS,\
+  tazunittest_bzureportPDS,tazunittest_bzuplayPDS,tazunittest_srcOptions,tazunittest_loadOptions,tazunittest_reportOptions,\
+  tazunittest_jobCard,tazunittest_maxPassRC,tazunittest_maxWarnRC,tazunittest_playbackFileExtension,\
+  tazunittest_eqaplayParms,tazunittest_userDebugSessionTestParm, \
+  tazunittest_dependencySearch
+
+tazunittest_bzucfgPDS=${hlq}.BZU.BZUCFG
+tazunittest_bzureportPDS=${hlq}.BZU.BZURPT
+tazunittest_bzuplayPDS=${hlq}.BZU.BZUPLAY
+
+# List the data sets that need to be created and their creation options
+tazunittest_srcDatasets=${tazunittest_bzucfgPDS}
+tazunittest_srcOptions=cyl space(1,1) lrecl(27998) dsorg(PO) recfm(V,B) dsntype(library)
+
+tazunittest_loadDatasets=${tazunittest_bzuplayPDS}
+tazunittest_loadOptions=cyl space(1,1) dsorg(PO) lrecl(256) recfm(F,B) blksize(32512) dsntype(library)
+
+tazunittest_reportDatasets=${tazunittest_bzureportPDS}
+tazunittest_reportOptions=tracks space(200,40) dsorg(PO) blksize(32760) lrecl(16383) recfm(v,b) dsntype(library)
+
+# tazunittest_dependenciesDatasetMapping - an optional dbb property mapping to map dependencies to different target datasets
+#  this property is used when dependencies are copied to the different build libraries, e.q dclgens going into to a dedicated library
+#  note, that a dependency file needs to match a single rule
+#
+#  sample:
+#   tazunittest_dependenciesDatasetMapping = tazunittest_bzuplayPDS :: **/bzuplay/*.rec
+#   tazunittest_dependenciesDatasetMapping = tazunittest_bzuplayPDS :: **/bzuplay_vtp/*.rec
+#
+#  default copies all dependencies into the dependency dataset definition which was previously passed to the utilities/BuildUitilities.copySourceFiles method
+#   tazunittest_dependenciesDatasetMapping = tazunittest_bzuplayPDS :: **/*
+tazunittest_dependenciesDatasetMapping = tazunittest_bzuplayPDS :: **/*
diff --git a/build-conf/ZunitConfig.properties b/build-conf/ZunitConfig.properties
diff --git a/build-conf/build.properties b/build-conf/build.properties
@@ -19,7 +19,7 @@
 buildPropFiles=${systemDatasets},GlobalOptions.properties,dependencyReport.properties,\
 Assembler.properties,BMS.properties,Cobol.properties,Transfer.properties,\
 MFS.properties,PSBgen.properties,DBDgen.properties,ACBgen.properties,\
-LinkEdit.properties,PLI.properties,REXX.properties,ZunitConfig.properties,\
+LinkEdit.properties,PLI.properties,REXX.properties,TazUnitTest.properties,\
 CRB.properties,zCEE3.properties,zCEE2.properties,Easytrieve.properties
 
 #
@@ -51,7 +51,7 @@ systemDatasets=datasets.properties
 # default-application-conf/PLI.properties,\
 # default-application-conf/Transfer.properties,\
 # default-application-conf/LinkEdit.properties,\
-# default-application-conf/ZunitConfig.properties
+# default-application-conf/TazUnitTest.properties
 #
 applicationDefaultPropFiles=defaultzAppBuildConf.properties
 

diff --git a/build-conf/datasets.properties b/build-conf/datasets.properties
@@ -69,8 +69,8 @@ SEQAMOD=
 # Optional IDz Load Library. Example: FEL.V14R0M0.SFELLOAD
 SFELLOAD=
 
-# Optional IDZ zUnit / WAZI VTP library containing necessary copybooks. Example : FEL.V14R2.SBZUSAMP
-SBZUSAMP=
+# Optional IBM Debug Tool library containing necessary TAZ copybooks. Example : DEBUG.V16.SEQASAMP
+SEQASAMP=
 
 # REXX Compiler Data Sets. Example: REXX.V1R4.SFANLMD
 SFANLMD=

diff --git a/docs/BUILD.md b/docs/BUILD.md
@@ -95,7 +95,7 @@ $DBB_HOME/bin/groovyz build.groovy  \
                       --debug \
                       --impactBuild
 ```
-**Use Code Coverage Headless Collector in zUnit Tests and specify parameters through command-line options (which override properties defined in ZunitConfig.properties)**
+**Use Code Coverage Headless Collector in zUnit Tests and specify parameters through command-line options (which override properties defined in TazUnitTest.properties)**
 ```
 $DBB_HOME/bin/groovyz build.groovy \
                       --workspace /u/build/repos \
@@ -300,7 +300,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -379,7 +379,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -483,7 +483,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -723,7 +723,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -882,7 +882,7 @@ Please see the output provided in verbose mode when setting up the collections a
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -1014,7 +1014,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/PLI.properties
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/REXX.properties
-** Loading property file /var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -1174,7 +1174,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/PLI.properties
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/REXX.properties
-** Loading property file /var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -1305,7 +1305,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/PLI.properties
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/REXX.properties
-** Loading property file /var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** Loading property file /var/dbb/dbb-zappbuild/build-conf/Transfer.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
@@ -1652,7 +1652,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -1796,7 +1796,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -1975,7 +1975,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -2135,7 +2135,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/Cobol.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/LinkEdit.properties
 ** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/PLI.properties
-** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/ZunitConfig.properties
+** Loading property file /ZT01/var/dbb/dbb-zappbuild/build-conf/TazUnitTest.properties
 ** appConf = /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/file.properties
 ** Loading property file /var/dbb/dbb-zappbuild/samples/MortgageApplication/application-conf/BMS.properties
@@ -2164,7 +2164,7 @@ groovyz dbb-zappbuild/build.groovy \
 ** The dataset DEBUG.V14R1.SEQAMOD referenced for property SEQAMOD was found.
 ** The dataset DBC0CFG.SDSNEXIT referenced for property SDSNEXIT was found.
 ** The dataset IMS.V15R1.SDFSRESL referenced for property SDFSRESL was found.
-** The dataset RATCFG.ZUNIT.SBZUSAMP referenced for property SBZUSAMP was found.
+** The dataset DEBUG.V16.SEQASAMP referenced for property SEQASAMP was found.
 ** The dataset CEE.SCEELKED referenced for property SCEELKED was found.
 ..... // lists of all build properties
 ...

diff --git a/docs/HOWTOS.md b/docs/HOWTOS.md
@@ -118,7 +118,7 @@ default-application-conf/BMS.properties,\
 default-application-conf/PLI.properties,\
 default-application-conf/Transfer.properties,\
 default-application-conf/LinkEdit.properties,\
-default-application-conf/ZunitConfig.properties
+default-application-conf/TazUnitTest.properties
 ..
 ```
 This allows to reduce the necessary definitions within the `application-conf` directory of the application repository. This `application-conf` directory now only contains the `application.properties` and `file.properties` files to define the application-specific settings and exceptions, such as [file properties](../docs/FilePropertyManagement.md#dbb-file-properties) for particular build files: