Skip to content

Commit

Permalink
Merge pull request #4017 from zowe/users/muzikovam/wfFix
Browse files Browse the repository at this point in the history
small workflow fix
  • Loading branch information
MarkAckert authored Sep 26, 2024
2 parents 1169fb2 + 20acfba commit 870c54b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 61 deletions.
2 changes: 1 addition & 1 deletion pswi/03_create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ 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":"ZOWE Configuration of Zowe 3.0","description":"This workflow configures 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.",
Expand Down
4 changes: 2 additions & 2 deletions pswi/scripts/base_diff.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
483c
471c
home: "#delete_me#"
.
468c
456c
home: "#delete_me#"
.
281c
Expand Down
4 changes: 2 additions & 2 deletions pswi/scripts/deploy_test_2_3.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ 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.",
{"name": "ZOWE Configuration of Zowe 3.0",
"description": "This workflow configures Zowe v3.0.",
"location": {"dsname": self.hlq + ".WORKFLOW(ZWECONF)"}},
{"name":"ZOWE Creation of CSR request workflow",
"description":"This workflow creates a certificate sign request.",
Expand Down
20 changes: 2 additions & 18 deletions workflows/files/ZWECONF.properties
Original file line number Diff line number Diff line change
Expand Up @@ -612,14 +612,6 @@ components_zss_port=7557
# Name for the ZSS cross memory server
components_zss_crossMemoryServerName=ZWESIS_STD

# components_zss_tls
# Label: ZSS TLS
# Abstract: Check this to enable TLS on ZSS
# Category: components
# Description:
# Check this to enable TLS on ZSS
components_zss_tls=true

# components_zss_agent_jwt_fallback
# Label: ZSS JWT fallback
# Abstract: Check this to enable fallback
Expand Down Expand Up @@ -660,22 +652,14 @@ components_explorer_mvs_enabled=true
# Check this option to enable the USS explorer.
components_explorer_uss_enabled=true

# useconfig_manager_enabled
# Label: Enable Zowe configuration manager
# Abstract: Check this option to enable Zowe configuration manager
# Category: configManager
# Description:
# Check this option to enable Zowe configuration manager.
useconfig_manager_enabled=true

# config_manager_validation
# Label: Zowe configuration manager validation type
# Abstract: STRICT or COMPONENT-COMPAT validation type
# Category: configManager
# Description:
# STRICT=quit on any error, COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit
# Choices: COMPONENT-COMPAT,STRICT
config_manager_validation=COMPONENT-COMPAT
config_manager_validation=STRICT

# zowe_rbacProfileId
# Label: Zowe Profile Identifier
Expand Down Expand Up @@ -774,4 +758,4 @@ zowe_setup_security_stcs_aux=ZWESASTC
# 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.
zowe_setup_installStep_enabled=false
zowe_setup_installStep_enabled=false
40 changes: 2 additions & 38 deletions workflows/files/ZWECONF.xml
Original file line number Diff line number Diff line change
Expand Up @@ -867,17 +867,6 @@ How we want to verify SSL certificates of services. Valid values are:
<default>ZWESIS_STD</default>
</string>
</variable>
<variable name="components_zss_tls" scope="instance" visibility="public">
<label>ZSS TLS</label>
<abstract>Check this to enable TLS on ZSS</abstract>
<description>Check this to enable TLS on ZSS</description>
<category>components</category>
<boolean>
<!-- Put validation here -->
<!-- Specify choices here -->
<default>true</default>
</boolean>
</variable>
<variable name="components_zss_agent_jwt_fallback" scope="instance" visibility="public">
<label>ZSS JWT fallback</label>
<abstract>Check this to enable fallback</abstract>
Expand Down Expand Up @@ -933,17 +922,6 @@ How we want to verify SSL certificates of services. Valid values are:
<default>true</default>
</boolean>
</variable>
<variable name="useconfig_manager_enabled" scope="instance" visibility="public">
<label>Enable Zowe configuration manager</label>
<abstract>Check this option to enable Zowe configuration manager</abstract>
<description>Check this option to enable Zowe configuration manager.</description>
<category>configManager</category>
<boolean>
<!-- Put validation here -->
<!-- Specify choices here -->
<default>true</default>
</boolean>
</variable>
<variable name="config_manager_validation" scope="instance" visibility="public">
<label>Zowe configuration manager validation type</label>
<abstract>STRICT or COMPONENT-COMPAT validation type</abstract>
Expand All @@ -954,7 +932,7 @@ How we want to verify SSL certificates of services. Valid values are:
<!-- Specify choices here -->
<choice>COMPONENT-COMPAT</choice>
<choice>STRICT</choice>
<default>COMPONENT-COMPAT</default>
<default>STRICT</default>
</string>
</variable>
<variable name="zowe_rbacProfileId" scope="instance" visibility="public">
Expand Down Expand Up @@ -1155,7 +1133,6 @@ How we want to verify SSL certificates of services. Valid values are:
<variableValue name="zOSMF_host" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="zOSMF_port" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="zOSMF_applId" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="useconfig_manager_enabled" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="config_manager_validation" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="components_gateway_enabled" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="components_zaas_enabled" scope="instance" noPromptIfSet="false" required="true"/>
Expand Down Expand Up @@ -1419,7 +1396,6 @@ How we want to verify SSL certificates of services. Valid values are:
</condition>
<variableValue name="components_zss_port" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="components_zss_crossMemoryServerName" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="components_zss_tls" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="components_zss_agent_jwt_fallback" scope="instance" noPromptIfSet="false" required="true"/>
<variableValue name="components_zss_agent_64bit" scope="instance" noPromptIfSet="false" required="true"/>
<instructions substitution="false">Run this step to specify the values for the ZSS variables</instructions>
Expand Down Expand Up @@ -1756,18 +1732,6 @@ echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.ya
echo ' # Where extensions are installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' extensionDirectory: $!{instance-zowe_extensionDirectory}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' useConfigmgr: $!{instance-useconfig_manager_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # Setting to true will enable:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # * schema-backed validation of zowe.yaml' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # * should greatly improve startup time.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # * can supply multiple zowe.yaml as defaults & overrides in the format of' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # FILE(/my/customizations.yaml):PARMLIB(MYORG.ZOWE(YAML)):FILE(/zowe/defaults.yaml)' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # * allows templating in zowe.yaml by putting references within ${{ }} blocks such as' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # rewriting the job section below as' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # job:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # name: ${{ zowe.job.prefix }}SV' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # prefix: ZWE1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' configmgr:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # STRICT=quit on any error, including missing schema' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
Expand Down Expand Up @@ -2009,7 +1973,7 @@ echo ' security:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' auth:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' provider: zosmf' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' zosmf:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' jwtAutoconfiguration: auto' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' jwtAutoconfiguration: jwt' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' serviceId: ibmzosmf' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' authorization:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' endpoint:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
Expand Down

0 comments on commit 870c54b

Please sign in to comment.