Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2 to v3 sync #3955

Merged
merged 25 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3eccda6
install command step optional
pavelzlatnik Jul 9, 2024
d81075e
Minor changes
Martin-Zeithaml Jul 11, 2024
a20455c
Minor update
Martin-Zeithaml Jul 11, 2024
4487504
Merge pull request #3909 from zowe/v2.x/bugfix/ZWEINSTL
MarkAckert Jul 12, 2024
0722529
Merge branch 'v2.x/staging' into user/zlatnikp/optionalStepFix
MarkAckert Jul 12, 2024
7824bc8
language refactor
janan07 Jul 15, 2024
e9b758b
fix component abstract/description language
janan07 Jul 16, 2024
d252a53
fix abstract lengths
janan07 Jul 16, 2024
e19cf1e
Merge pull request #3904 from zowe/user/zlatnikp/optionalStepFix
MarkAckert Jul 17, 2024
60d8fae
Promote PTF after release v2.17.0
zowe-robot Jul 18, 2024
f40cc83
Merge pull request #3919 from zowe/users/robot/promote-ptf-from-88
MarkAckert Jul 18, 2024
d76ac6f
update manifest to create 2.18 staging builds
MarkAckert Jul 18, 2024
59faddf
Merge pull request #3920 from zowe/user/markackert/staging-2.18
MarkAckert Jul 18, 2024
8179ef2
Switch launcher path to point to staging
Jul 24, 2024
2129b5a
Merge branch 'v2.x/staging' into users/jstruga/update-launcher-path
struga0258 Jul 24, 2024
1bf063b
Merge pull request #3924 from zowe/users/jstruga/update-launcher-path
MarkAckert Jul 24, 2024
07b929e
Backport fixes in v2.x/master to v2.x/staging (#3923)
MarkAckert Jul 24, 2024
1f9ad77
Rename ssh host name (#3927)
ManjuVNair133 Jul 31, 2024
83b086f
Clean up for crashing java (#3931)
Martin-Zeithaml Aug 12, 2024
0c2c64e
update safkeyring schema (#3928)
MarkAckert Aug 12, 2024
6acc8e2
Use correct parameters (#3929)
Martin-Zeithaml Aug 12, 2024
a4ff599
NONRLS vsam mode if variable not initialized (#3935)
pavelzlatnik Aug 14, 2024
b6911ac
Add DigitalOcean sponsorship link - per guidelines for credits (#3940)
jmertic Aug 14, 2024
f28ac11
Promote PTF after release v2.18.0 (#3954)
zowe-robot Aug 27, 2024
70a8204
Merge branch 'v2.x/staging' into user/markackert/sync-v2-to-v3-827
MarkAckert Aug 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,10 @@ Please check details in [playbooks folder](playbooks/README.md).
## Quick Sanity Check on Your Zowe Instance

Please check details in [sanity test folder](tests/sanity/README.md).

<p>Hosting infrastructure for this project is supported by:</p>
<p>
<a href="https://www.digitalocean.com/?refcode=77a4454d32a1&utm_campaign=Referral_Invite&utm_medium=Referral_Program&utm_source=badge">
<img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
</a>
</p>
2 changes: 1 addition & 1 deletion bin/libs/zosmf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export function validateZosmfHostAndPort(zosmfHost: string, zosmfPort: number):
common.printError(`Warning: Could not validate if z/OS MF is available on 'https://${zosmfHost}:${zosmfPort}/zosmf/info'. NODE_HOME is not defined.`);
zosmfCheckPassed=false;
} else {
let execReturn = shell.execOutSync(`${std.getenv('NODE_HOME')}/bin/node`, `${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl.js`, `"https://${zosmfHost}:${zosmfPort}/zosmf/info"`, `-k`, `-H`, `"X-CSRF-ZOSMF-HEADER: true"`, `--response-type`, `status`);
const execReturn = shell.execOutSync(`${std.getenv('NODE_HOME')}/bin/node`, `${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl.js`, `https://${zosmfHost}:${zosmfPort}/zosmf/info`, `-k`, `-H`, `X-CSRF-ZOSMF-HEADER: true`, `--response-type`, `status`);
if (execReturn.rc || !execReturn.out) {
common.printError(`Warning: Could not validate if z/OS MF is available on 'https://${zosmfHost}:${zosmfPort}/zosmf/info'. No response code from z/OSMF server.`);
zosmfCheckPassed=false
Expand Down
4 changes: 4 additions & 0 deletions workflows/files/ZWECONF.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1752,7 +1752,11 @@ echo ' # VSAM configurations if you are using VSAM as Caching Service storage
echo ' vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # VSAM data set with Record-Level-Sharing enabled or not' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # Valid values could be: NONRLS or RLS.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
#if (${instance-zowe_setup_vsam_mode})
echo ' mode: $!{instance-zowe_setup_vsam_mode}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
#else
echo ' mode: NONRLS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
#end
echo ' # Volume name if you are using VSAM in NONRLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' volume: "$!{instance-zowe_setup_vsam_volume}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # Storage class name if you are using VSAM in RLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
Expand Down
Loading