Retrofit workflows changes from Zowe V3 RC3 (new API ML workflow incl…

…uded) (#4176) * initAPIMLwf2x Signed-off-by: Pavel Zlatnik <[email protected]> * iteration1 Signed-off-by: Pavel Zlatnik <[email protected]> * iteration2 Signed-off-by: Pavel Zlatnik <[email protected]> * signcomit Signed-off-by: Pavel Zlatnik <[email protected]> * set debugs to flase Signed-off-by: Pavel Zlatnik <[email protected]> * lastComponents Signed-off-by: Pavel Zlatnik <[email protected]> * port reorder Signed-off-by: Pavel Zlatnik <[email protected]> * wf version based on pipeline Signed-off-by: Pavel Zlatnik <[email protected]> * signof Signed-off-by: Pavel Zlatnik <[email protected]> * packaging pswi v2 Signed-off-by: Pavel Zlatnik <[email protected]> * apiml wf logic changes Signed-off-by: Pavel Zlatnik <[email protected]> * proper apiml wording Signed-off-by: Pavel Zlatnik <[email protected]> * zowe conf update Signed-off-by: Pavel Zlatnik <[email protected]> --------- Signed-off-by: Pavel Zlatnik <[email protected]> Co-authored-by: Mark Ackert <[email protected]>
zowe · Feb 10, 2025 · 501f4a1 · 501f4a1
1 parent f048cde
commit 501f4a1
Show file tree

Hide file tree

Showing 5 changed files with 1,470 additions and 47 deletions.
diff --git a/example-zowe.yaml b/example-zowe.yaml
@@ -39,7 +39,7 @@ zowe:
     # MVS data set related configurations
     dataset:
       # **COMMONLY_CUSTOMIZED**
-      # where are existing Zowe SZWEEXEC Target libraries
+      # where Zowe MVS data sets will be installed
       prefix: IBMUSER.ZWEV2
       # **COMMONLY_CUSTOMIZED**
       # PROCLIB where Zowe STCs will be copied over

diff --git a/pswi/03_create.sh b/pswi/03_create.sh
@@ -28,7 +28,8 @@ echo "z/OSMF version     :" $ZOSMF_V
 # JSONs
 ADD_SWI_JSON='{"name":"'${SWI_NAME}'","system":"'${ZOSMF_SYSTEM}'","description":"ZOWE v'${VERSION}' Portable Software Instance",
 "globalzone":"'${GLOBAL_ZONE}'","targetzones":["'${TZONE}'"],"workflows":[{"name":"ZOWE Mount Workflow","description":"This workflow performs mount action of ZOWE zFS.",
-"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEWRF02)"}},{"name":"ZOWE Configuration of Zowe 2.0","description":"This workflow configures Zowe v2.0.",
+"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEWRF02)"}},{"name":"Stand-alone Zowe API ML Configuration","description":"This workflow configures only API ML for Zowe 2.0.",
+"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEAMLCF)"}},{"name":"Full Zowe server-side configuration for Zowe 2.0","description":"This workflow configures all Zowe server-side components for Zowe v2.0.",
 "location": {"dsname":"'${WORKFLOW_DSN}'(ZWECONF)"}},{"name":"ZOWE Creation of CSR request workflow","description":"This workflow creates a certificate sign request.",
 "location": {"dsname":"'${WORKFLOW_DSN}'(ZWECRECR)"}},{"name":"ZOWE Sign a CSR request","description":"This workflow signs the certificate sign request by a local CA.",
 "location": {"dsname":"'${WORKFLOW_DSN}'(ZWESIGNC)"}},{"name":"ZOWE Load Authentication Certificate into ESM","description":"This workflow loads a signed client authentication certificate to the ESM.",
@@ -145,6 +146,11 @@ echo "target=\"//'${WORKFLOW_DSN}(ZWESIGNC)'\";" >>JCL
 echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWESIGNC;" >>JCL
 echo "sed 's|UTF-8|IBM-1047|g' _ZWESIGNC > ZWESIGNC;" >>JCL
 echo "cp -T ZWESIGNC \$target;" >>JCL
+echo "source=\"${ZOWE_MOUNT}files/workflows/ZWEAMLCF.xml\";" >>JCL
+echo "target=\"//'${WORKFLOW_DSN}(ZWEAMLCF)'\";" >>JCL
+echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWEAMLCF;" >>JCL
+echo "sed 's|UTF-8|IBM-1047|g' _ZWEAMLCF > ZWEAMLCF;" >>JCL
+echo "cp -T ZWEAMLCF \$target;" >>JCL
 echo "source=\"${ZOWE_MOUNT}files/workflows/ZWECONF.xml\";" >>JCL
 echo "target=\"//'${WORKFLOW_DSN}(ZWECONF)'\";" >>JCL
 echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWECONF;" >>JCL

diff --git a/pswi/scripts/deploy_test_2_3.py b/pswi/scripts/deploy_test_2_3.py
@@ -196,9 +196,12 @@ def create_swi(self):
                {"name": "ZOWE Mount Workflow",
                 "description": "This workflow performs mount action of ZOWE zFS.",
                 "location": {"dsname": self.hlq + ".WORKFLOW(ZWEWRF02)"}},
-              {"name": "ZOWE Configuration of Zowe 2.0",
-               "description": "This workflow configures Zowe v2.0.",
-               "location": {"dsname": self.hlq + ".WORKFLOW(ZWECONF)"}},
+              {"name": "Stand-alone Zowe API ML Configuration",
+                "description": "This workflow configures only API ML for Zowe 2.0.",
+                "location": {"dsname": self.hlq + ".WORKFLOW(ZWEAMLCF)"}},
+              {"name": "Full Zowe server-side configuration for Zowe 2.0",
+                "description": "This workflow configures all Zowe server-side components for Zowe v2.0.",
+                "location": {"dsname": self.hlq + ".WORKFLOW(ZWECONF)"}},
               {"name":"ZOWE Creation of CSR request workflow",
                "description":"This workflow creates a certificate sign request.",
                "location": {"dsname": self.hlq + ".WORKFLOW(ZWECRECR)"}},