From 846ceb9daa49c494be0085ea0312af03c85f5d52 Mon Sep 17 00:00:00 2001 From: pavelzlatnik <45940302+pavelzlatnik@users.noreply.github.com> Date: Mon, 3 Feb 2025 19:15:38 +0100 Subject: [PATCH] Merge pull request #4161 from zowe/user/zlatnikp/installstep User/zlatnikp/installstep --- example-zowe.yaml | 2 +- pswi/03_create.sh | 6 +-- pswi/scripts/deploy_test_2_3.py | 10 ++-- pswi/scripts/wf_run_test.sh | 4 +- workflows/files/ZWEAMLCF.xml | 63 ++++++++++++++++++------ workflows/files/ZWECONF.properties | 9 ---- workflows/files/ZWECONF.xml | 79 ++++++++++++------------------ 7 files changed, 90 insertions(+), 83 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index 726cf64608..78d0ffb1c2 100644 --- 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.ZWEV3 # **COMMONLY_CUSTOMIZED** # PROCLIB where Zowe STCs will be copied over diff --git a/pswi/03_create.sh b/pswi/03_create.sh index 115c2dafc8..cacd595748 100644 --- a/pswi/03_create.sh +++ b/pswi/03_create.sh @@ -28,9 +28,9 @@ 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 3.0","description":"This workflow configures Zowe v3.0.", -"location": {"dsname":"'${WORKFLOW_DSN}'(ZWECONF)"}},{"name":"ZOWE APIML optimized Configuration","description":"This simplified workflow configures APIML for Zowe 3.0.", -"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEAMLCF)"}},{"name":"ZOWE Creation of CSR request workflow","description":"This workflow creates a certificate sign request.", +"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEWRF02)"}},{"name":"Stand-alone Zowe API ML Configuration","description":"This workflow configures only API ML for Zowe 3.0.", +"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEAMLCF)"}},{"name":"Full Zowe server-side configuration for Zowe 3.0","description":"This workflow configures all Zowe server-side components for Zowe v3.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.", "location": {"dsname":"'${WORKFLOW_DSN}'(ZWELOADC)"}},{"name":"ZOWE Define key ring and certificates","description":"This workflow defines key ring and certificates for Zowe.", diff --git a/pswi/scripts/deploy_test_2_3.py b/pswi/scripts/deploy_test_2_3.py index 4779653002..db4f94e85e 100644 --- a/pswi/scripts/deploy_test_2_3.py +++ b/pswi/scripts/deploy_test_2_3.py @@ -312,12 +312,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 3.0", - "description": "This workflow configures Zowe v3.0.", - "location": {"dsname": self.hlq + ".WORKFLOW(ZWECONF)"}}, - {"name": "ZOWE APIML optimized Configuration", - "description": "This simplified workflow configures APIML for Zowe 3.0.", + {"name": "Stand-alone Zowe API ML Configuration", + "description": "This workflow configures only API ML for Zowe 3.0.", "location": {"dsname": self.hlq + ".WORKFLOW(ZWEAMLCF)"}}, + {"name": "Full Zowe server-side configuration for Zowe 3.0", + "description": "This workflow configures all Zowe server-side components for Zowe v3.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)"}}, diff --git a/pswi/scripts/wf_run_test.sh b/pswi/scripts/wf_run_test.sh index 7429c91a9a..ce60402338 100755 --- a/pswi/scripts/wf_run_test.sh +++ b/pswi/scripts/wf_run_test.sh @@ -83,8 +83,8 @@ if [ "$run" = "run" ]; then echo "Checking if the workflow is ZWECONF" >>$LOG_DIR/report.txt if [ "$ZWECONF" = "ZWECONF" ]; then STEP_NAME=$(echo $RESP | grep -o '"currentStepName":".*"' | cut -f4 -d\") - if [ "$STEP_NAME" = "init_zowe" ]; then - echo "The workflow is ZWECONF and should end in step 'init_zowe'" + if [ "$STEP_NAME" = "install_zowe" ]; then + echo "The workflow is ZWECONF and should end in step 'install_zowe', first step of 'zowe_installation_steps'" STATUS="FINISHED" else echo "The workflow is ZWECONF but ended in different step: '$STEP_NAME'" >>$LOG_DIR/report.txt diff --git a/workflows/files/ZWEAMLCF.xml b/workflows/files/ZWEAMLCF.xml index eb12c13736..d47f87945f 100644 --- a/workflows/files/ZWEAMLCF.xml +++ b/workflows/files/ZWEAMLCF.xml @@ -4,17 +4,17 @@ config_apiml_zowe_30 - Configuration of APIML for Zowe 3.0 - Use this simplified workflow to configure APIML for Zowe 3.0 + Configuration of API ML for Zowe 3.0 + Use this simplified workflow to configure API ML for Zowe 3.0 ###ZOWE_VERSION### Zowe - - Prefix of existing SZWEEXEC Target libraries created during PSWI or SMP/E - Prefix of existing SZWEEXEC Target libraries created during PSWI or SMP/E installation phase + + Prefix of datasets where remaining runtime datasets will be created + Prefix of datasets where remaining runtime libraries will be created within execution of Zowe install step (SZWEAUTH, SZWESAMP, SZWEEXEC, SZWELOAD) zowe @@ -405,8 +405,8 @@ some use cases, like containerization, this port could be different. - Port for APIML Gateway - Port for APIML Gateway + Port for API ML Gateway + Port for API ML Gateway components @@ -416,8 +416,8 @@ some use cases, like containerization, this port could be different. - Port for APIML ZAAS - Port for APIML ZAAS + Port for API ML ZAAS + Port for API ML ZAAS components @@ -698,13 +698,13 @@ some use cases, like containerization, this port could be different. Create configuration - Creates the configuration for the Zowe (APIML) + Creates the configuration for the Zowe (API ML) - + Generated yaml file is backward compatible with full Zowe,
- this workflow is just simplified with focus on easier APIML configuration.
+ this workflow is just simplified with focus on easier API ML configuration.
Ensure that the values are correct.
zowe.yaml file is created in the: ${instance-zowe_runtimeDirectory} directory

NOTE: If you run this workflow outside of PSWI (SMP/E or convenience build), you might encounter a folder write permission issue.
@@ -767,7 +767,7 @@ echo ' setup:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # MVS data set related configurations' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' dataset:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # where are existing Zowe SZWEEXEC Target libraries' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # where Zowe MVS data sets will be installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' prefix: $!{instance-zowe_setup_dataset_prefix}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # PROCLIB where Zowe STCs will be copied over' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -1407,11 +1407,46 @@ echo '# enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" Zowe installation - Zowe installation + Zowe installation + + Run the Zowe install + Configure Zowe. + + + + zwe install -c ${instance-zowe_runtimeDirectory}/zowe.yml
+ Will create remaining runtime data sets under zowe.setup.dataset.prefix definition,
+ i.e. under specified prefix ${instance-zowe_setup_dataset_prefix}:
+ SZWEAUTH contains few Zowe load modules (++PROGRAM).
+ SZWESAMP contains several sample configurations.
+ SZWEEXEC contains few utilities used by Zowe.
+ SZWELOAD contains config manager for REXX.
+ ]]> + 1 + z/OS System Programmer + false + false + + Run scripts for Zowe initialization Executes scripts for Zowe initialization + - - Prefix of existing SZWEEXEC Target libraries created during PSWI or SMP/E - Prefix of existing SZWEEXEC Target libraries created during PSWI or SMP/E installation phase + + Prefix of datasets where remaining runtime datasets will be created + Prefix of datasets where remaining runtime libraries will be created within execution of Zowe install step (SZWEAUTH, SZWESAMP, SZWEEXEC, SZWELOAD) zowe @@ -514,8 +514,8 @@ How we want to verify SSL certificates of services. Valid values are: - Port for the APIML Gateway - Port for the APIML Gateway + Port for the API ML Gateway + Port for the API ML Gateway components @@ -535,9 +535,9 @@ How we want to verify SSL certificates of services. Valid values are: - - Check this option to enable APIML ZAAS - Check this option to enable APIML ZAAS + + Check this option to enable API ML ZAAS + Check this option to enable API ML ZAAS components @@ -547,8 +547,8 @@ How we want to verify SSL certificates of services. Valid values are: - Port for APIML ZAAS - Port for APIML ZAAS + Port for API ML ZAAS + Port for API ML ZAAS components @@ -568,7 +568,7 @@ How we want to verify SSL certificates of services. Valid values are: - + Authorization provider for the Gateway Authorization provider for the Gateway components @@ -579,7 +579,7 @@ How we want to verify SSL certificates of services. Valid values are: - + JWT auto configuration for Gateway security auth JWT auto configuration for Gateway security auth components @@ -592,7 +592,7 @@ How we want to verify SSL certificates of services. Valid values are: - + Service ID for Gateway security auth Service ID for Gateway security auth components @@ -603,7 +603,7 @@ How we want to verify SSL certificates of services. Valid values are: - + Use this to enable the security authorization endpoint Use this to enable the security authorization endpoint components @@ -614,7 +614,7 @@ How we want to verify SSL certificates of services. Valid values are: - + Security authorization provider for the Gateway Security authorization provider for the Gateway components @@ -625,7 +625,7 @@ How we want to verify SSL certificates of services. Valid values are: - + Check to enable the Gateway security x509 Check to enable the Gateway security x509 components @@ -1067,20 +1067,7 @@ How we want to verify SSL certificates of services. Valid values are: ZWESASTC - - - - Check to enable this run step with the zwe install command. For convenience build only. - Check this option to enable the optional workflow step with zwe install command. After Zowe convenience build is extracted, - you can enable this flag to run the zwe install command to install MVS data sets within this workflow run. - This option is for convenience build only. SMP/E installs the MVS data sets during installation. - installMVSDatasets - - - - false - - + @@ -1152,8 +1139,7 @@ How we want to verify SSL certificates of services. Valid values are: - - + Run this step to fill base variables. 1 z/OS System Programmer @@ -1475,7 +1461,7 @@ echo ' setup:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # MVS data set related configurations' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' dataset:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" -echo ' # where are existing Zowe SZWEEXEC Target libraries' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' # where Zowe MVS data sets will be installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' prefix: $!{instance-zowe_setup_dataset_prefix}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # PROCLIB where Zowe STCs will be copied over' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" @@ -2225,26 +2211,21 @@ echo '# enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" Zowe installation Zowe installation - - Run the Zowe install (only for convenience build) - Configure Zowe. + + Run the Zowe install + Configure Zowe. - - 1==1 - Always true - - - Skips this step if Install the MVS data sets was not selected - !${instance-zowe_setup_installStep_enabled} - skipped - - - zwe install -c ${instance-zowe_runtimeDirectory}/zowe.yml + This step runs the command: zwe install -c ${instance-zowe_runtimeDirectory}/zowe.yml
+ Will create remaining runtime data sets under zowe.setup.dataset.prefix definition,
+ i.e. under specified prefix ${instance-zowe_setup_dataset_prefix}:
+ SZWEAUTH contains few Zowe load modules (++PROGRAM).
+ SZWESAMP contains several sample configurations.
+ SZWEEXEC contains few utilities used by Zowe.
+ SZWELOAD contains config manager for REXX.
]]> 1 z/OS System Programmer @@ -2264,7 +2245,7 @@ zwe install -c '${instance-zowe_runtimeDirectory}/zowe.yaml' --allow-overwrite1024 - + Run scripts for Zowe initialization Executes scripts for Zowe initialization