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

User/zlatnikp/installstep #4161

Merged
merged 6 commits into from
Feb 3, 2025
Merged

Conversation

pavelzlatnik
Copy link
Contributor

Please check if your PR fulfills the following requirements. This is simply a reminder of what we are going to look for before merging your PR. If you don't know all of this information when you create this PR, don't worry. You can edit this template as you're working on it.

  • Tests for the changes have been added (for bug fixes / features)
  • Necessary documentation (if appropriate) have been added / updated
  • DCO signoffs have been added to all commits, including this PR

PR type

What type of changes does your PR introduce to Zowe? Put an x in the box that applies to this PR. If you're unsure about any of them, don't hesitate to ask.

  • Bugfix
  • Feature
  • Other... Please describe:

Relevant issues

Fixes #4083

Changes proposed in this PR

1.Based on testing, install step is not only for conv. build.
Documentation is wrong,
https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/zwe-install/
There is statement : If you are using SMPE build, you can skip this command since MVS data sets are already prepared during SMPE install.
But that is not truth, there are created only TARGET libraries of those 4, not runtime libraries which should be used for zowe runtime.

Install step is needed to allocate remaining runtime dataset (not created via PSWI or SMP/E).
Without install step, user have to run zowe from TARGET libraries which were created via PSWI or SMP/E, which is wrong.
Modified in zowe configuration workflow and in API ML configuration workflow.

2.Changed description of zowe_setup_dataset_prefix variable, because it should be runtime prefix (for datasets created by install step), not for Target (target lib should not be used for real run of zowe)

3.Reordered API ML and zowe configuration workflow in pswi, to put API ML before zowe, and change workflow names displayed in PSWI to better describe only one of them should be used.

Does this PR introduce a breaking change?

  • Yes
  • No

Does this PR do something the person installing Zowe should know about?

Yes, I will create ticket to update zowe documentation, because in places like here
https://docs.zowe.org/stable/user-guide/configure-zowe-zosmf-workflow#3-zowe-installation

https://docs.zowe.org/stable/appendix/zwe_server_command_reference/zwe/zwe-install/
is written install step is only for convenience build, but it is not truth. Without install step, those 4 are not created as runtime datasets
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.


  • Affected function: general area of interest *

  • Description: 1 line description *

  • Part: name of customizable file involved *

multi-line description

Is there a related doc issue or Pull Request?

Doc issue/PR number:

Other information

Copy link

github-actions bot commented Jan 30, 2025

build 6891 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/13050223167

Copy link

github-actions bot commented Jan 30, 2025

Test workflow 6050 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/3.1.0-PR-4161/zowe-3.1.0-pr-4161-6891-20250130102406.pax
Running on machine: zzow11
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/13050307967

@MarkAckert
Copy link
Member

The PSWI workflow is failing here:

if [ "$STEP_NAME" = "init_zowe" ]; then

With this PR, the install step is hit before the init step, and the install step fails. I think this is to be expected - the init step was failing before and the automation would quit out successfully there. I don't know if you want the install to succeed, or if you want to change the expected fail point to install_zowe. Either should fix the build.

@pavelzlatnik
Copy link
Contributor Author

The PSWI workflow is failing here:

if [ "$STEP_NAME" = "init_zowe" ]; then

With this PR, the install step is hit before the init step, and the install step fails. I think this is to be expected - the init step was failing before and the automation would quit out successfully there. I don't know if you want the install to succeed, or if you want to change the expected fail point to install_zowe. Either should fix the build.

you are right, because I modified install to be NOT optional, i need to change the expected fail point to install step instead of init as was until now

Copy link

github-actions bot commented Jan 31, 2025

build 6894 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/13069523993

@pavelzlatnik
Copy link
Contributor Author

build 6894 https://github.com/zowe/zowe-install-packaging/actions/runs/13069523993
Run echo "One or more SAMP or EXEC file(s) have changed."
echo "One or more SAMP or EXEC file(s) have changed."
echo "This may require HOLDDATA to be created."
echo "Files changed: $TEST_ALL_CHANGED_FILES"
exit 1
shell: /usr/bin/bash -e {0}
env:
TEST_ALL_CHANGED_FILES: example-zowe.yaml
One or more SAMP or EXEC file(s) have changed.
This may require HOLDDATA to be created.
Files changed: example-zowe.yaml

There was done only change of comment in example zowe yaml, no need to create holddata for this, how to skip this "failure"? @MarkAckert

Copy link

github-actions bot commented Jan 31, 2025

Test workflow 6054 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/3.1.0-PR-4161/zowe-3.1.0-pr-4161-6894-20250131090518.pax
Running on machine: zzow09
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/13069606911

@MarkAckert
Copy link
Member

build 6894 zowe/zowe-install-packaging/actions/runs/13069523993
Run echo "One or more SAMP or EXEC file(s) have changed."
echo "One or more SAMP or EXEC file(s) have changed."
echo "This may require HOLDDATA to be created."
echo "Files changed: $TEST_ALL_CHANGED_FILES"
exit 1
shell: /usr/bin/bash -e {0}
env:
TEST_ALL_CHANGED_FILES: example-zowe.yaml
One or more SAMP or EXEC file(s) have changed.
This may require HOLDDATA to be created.
Files changed: example-zowe.yaml

There was done only change of comment in example zowe yaml, no need to create holddata for this, how to skip this "failure"? @MarkAckert

We just leave the failure and can note somewhere in comment or PR description that no HOLDDATA is required. It's not a required check to merge the PR, it's meant to catch our attention in case we needed HOLDDATA.

Copy link

github-actions bot commented Feb 3, 2025

build 6905 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/13118213662

Copy link

github-actions bot commented Feb 3, 2025

Test workflow 6066 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/3.1.0-PR-4161/zowe-3.1.0-pr-4161-6905-20250203164038.pax
Running on machine: zzow09
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/13118364882

@MarkAckert MarkAckert merged commit 5df0730 into v3.x/staging Feb 3, 2025
13 of 14 checks passed
@MarkAckert MarkAckert deleted the user/zlatnikp/installstep branch February 3, 2025 18:15
MarkAckert pushed a commit that referenced this pull request Feb 3, 2025
MarkAckert pushed a commit that referenced this pull request Feb 3, 2025
User/zlatnikp/installstep

Signed-off-by: MarkAckert <[email protected]>
MarkAckert added a commit that referenced this pull request Feb 3, 2025
User/zlatnikp/installstep

Signed-off-by: MarkAckert <[email protected]>
Co-authored-by: pavelzlatnik <[email protected]>
MarkAckert added a commit that referenced this pull request Feb 3, 2025
* Add zlux content for v3

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Support for getStatvfs

Signed-off-by: Martin Zeithaml <[email protected]>

* Typo

Signed-off-by: Martin Zeithaml <[email protected]>

* Changelog update

Signed-off-by: Martin Zeithaml <[email protected]>

* need to change USS dir permissions so the target user can successfully run zwe command and change the permissions themselves

Signed-off-by: mm667937 <[email protected]>

* Update manifest.json.template

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update defaults.yaml to example-zowe.yaml

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update CHANGELOG.md for breaking changes

Signed-off-by: 1000TurquoisePogs <[email protected]>

* update docker registry for apiml images

Signed-off-by: MarkAckert <[email protected]>

* fix sample-node-api version used in v3 pipelines

Signed-off-by: MarkAckert <[email protected]>

* small fix

Signed-off-by: pz636264 <[email protected]>

* Upgrade Zowe version to 3.1

Signed-off-by: James Struga <[email protected]>

* Wrong error check

Signed-off-by: Martin Zeithaml <[email protected]>

* Allow preconfigure in schema

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update manifest-schema.json

Signed-off-by: 1000TurquoisePogs <[email protected]>

* update automation for new zzow systems

Signed-off-by: MarkAckert <[email protected]>

* Small schema update

Signed-off-by: Martin Zeithaml <[email protected]>

* Changelog PR number update

Signed-off-by: Martin Zeithaml <[email protected]>

* more detail for failed test about zowe.yaml check

Signed-off-by: mm667937 <[email protected]>

* only run tests automatically from PRs

Signed-off-by: MarkAckert <[email protected]>

* fix paren

Signed-off-by: MarkAckert <[email protected]>

* remove imbalanced paren

Signed-off-by: MarkAckert <[email protected]>

* Diagnose in JS only

Signed-off-by: Martin Zeithaml <[email protected]>

* Changelog and _CEE_RUNOPTS

Signed-off-by: Martin Zeithaml <[email protected]>

* Changelog

Signed-off-by: Martin Zeithaml <[email protected]>

* I need to not delet the pswi so we can check where the issue happened - like if the PSWI wouuld be fine then there is a problem with testing

Signed-off-by: mm667937 <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Martin Zeithaml <[email protected]>

* there was some deletion

Signed-off-by: mm667937 <[email protected]>

* I can download the pswi to my folder which I am uploading as part of the github workflow so everything can be cleaned

Signed-off-by: mm667937 <[email protected]>

* 2.3 won't be probable needed.
Don't know if there still isn't anything left from that time when we had only 2.3

Signed-off-by: mm667937 <[email protected]>

* Check log directory

Signed-off-by: Martin Zeithaml <[email protected]>

* update pswi logs, fix pswi creation

Signed-off-by: MarkAckert <[email protected]>

* correct more logs

Signed-off-by: MarkAckert <[email protected]>

* fix zosmf_system parameter

Signed-off-by: MarkAckert <[email protected]>

* smol changes

Signed-off-by: mm667937 <[email protected]>

* probably fixed the log problem

Signed-off-by: mm667937 <[email protected]>

* while

Signed-off-by: mm667937 <[email protected]>

* all zlux ui plugin tests through apiml

Signed-off-by: MarkAckert <[email protected]>

* missed one port

Signed-off-by: MarkAckert <[email protected]>

* some more info added

Signed-off-by: mm667937 <[email protected]>

* Use xplatform for logging

Signed-off-by: Martin Zeithaml <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Martin Zeithaml <[email protected]>

* line needed splitting

Signed-off-by: mm667937 <[email protected]>

* formatting

Signed-off-by: mm667937 <[email protected]>

* Fix of the workflow so the test can finally pass

Signed-off-by: mm667937 <[email protected]>

* paxing uss instead of zfs

Signed-off-by: mm667937 <[email protected]>

* disable test for workflows because they run on top of testing dataset that are skipped for now

Signed-off-by: mm667937 <[email protected]>

* Use configmgr to read yaml in shell

Signed-off-by: Martin Zeithaml <[email protected]>

* Changelog update

Signed-off-by: Martin Zeithaml <[email protected]>

* Return empty string

Signed-off-by: Martin Zeithaml <[email protected]>

* Read yaml by configmgr (#4069)

* Read yaml by configmgr

Signed-off-by: Martin Zeithaml <[email protected]>

* Changelog update

Signed-off-by: Martin Zeithaml <[email protected]>

* When not found, return empty string

Signed-off-by: Martin Zeithaml <[email protected]>

* Changelog update

Signed-off-by: Martin Zeithaml <[email protected]>

---------

Signed-off-by: Martin Zeithaml <[email protected]>
Co-authored-by: 1000TurquoisePogs <[email protected]>

* creation of "Install zFS Data Sets" JCL for 3.1 zosmf

Signed-off-by: mm667937 <[email protected]>

* I need to unmount .# zFS because the script failed before it could be unmounted

Signed-off-by: mm667937 <[email protected]>

* issue4076Nodejs

Signed-off-by: Pavel Zlatnik <[email protected]>

* work zfs wasnt being deleted

Signed-off-by: mm667937 <[email protected]>

* issue4081 init steps

Signed-off-by: Pavel Zlatnik <[email protected]>

* issue4078 Gateway only

Signed-off-by: Pavel Zlatnik <[email protected]>

* path not found

Signed-off-by: mm667937 <[email protected]>

* order

Signed-off-by: mm667937 <[email protected]>

* issue4082 subcommands desc clean

Signed-off-by: Pavel Zlatnik <[email protected]>

* issue4085 reword

Signed-off-by: Pavel Zlatnik <[email protected]>

* issue 4086 acf2 genreq

Signed-off-by: Pavel Zlatnik <[email protected]>

* issue4086 new link

Signed-off-by: Pavel Zlatnik <[email protected]>

* it is better to go with jcl because rest api call does not support `-p` when doing mkdir

Signed-off-by: mm667937 <[email protected]>

* d.ts update

Signed-off-by: Martin Zeithaml <[email protected]>

* Update node min version

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update node.sh

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Use node 18 during build

Signed-off-by: 1000TurquoisePogs <[email protected]>

* PATH MUST END WITH A SLASH ("/").

Signed-off-by: mm667937 <[email protected]>

* Read arrays by internal config get

Signed-off-by: Martin Zeithaml <[email protected]>

* issue4077 components

Signed-off-by: Pavel Zlatnik <[email protected]>

* reword

Signed-off-by: Pavel Zlatnik <[email protected]>

* example yaml sync update

Signed-off-by: Pavel Zlatnik <[email protected]>

* Fixed #4074

Signed-off-by: vm635318 <[email protected]>

* issue4083 change prefix meaning

Signed-off-by: Pavel Zlatnik <[email protected]>

* small cleanup

Signed-off-by: mm667937 <[email protected]>

* I need to create PSWI version 9

Signed-off-by: mm667937 <[email protected]>

* I forgot that I can't run the tests

Signed-off-by: mm667937 <[email protected]>

* back to old wrong methd because I will fix that in later PR

Signed-off-by: mm667937 <[email protected]>

* remove additional references to node 16, remove optional 18 builds (now default)

Signed-off-by: MarkAckert <[email protected]>

* update based on feedback

Signed-off-by: Pavel Zlatnik <[email protected]>

* adds python sdk to sourceDependencies. adds new field "core" to source dep entry

Signed-off-by: MarkAckert <[email protected]>

* update based on Mark's feedback

Signed-off-by: Pavel Zlatnik <[email protected]>

* Delete last char

Signed-off-by: Martin Zeithaml <[email protected]>

* deleted print

Signed-off-by: mm667937 <[email protected]>

* setup lychee link check

Signed-off-by: MarkAckert <[email protected]>

* add easier console error review

Signed-off-by: MarkAckert <[email protected]>

* update jq step to always run

Signed-off-by: MarkAckert <[email protected]>

* dead links fixed

Signed-off-by: mm667937 <[email protected]>

* change node_home_pattern

Signed-off-by: MarkAckert <[email protected]>

* add node-v22 tests and add them to extended suite

Signed-off-by: MarkAckert <[email protected]>

* add comment describing the link checker workflow

Signed-off-by: MarkAckert <[email protected]>

* new PTF numbers (#4109)

Signed-off-by: ONNO VAN DEN TROOST <[email protected]>

* switch v3 nightly to ptf builds (#4110)

Signed-off-by: MarkAckert <[email protected]>

* Fix v3 PTF Build (#4111)

* found some lingering azwe002 references

Signed-off-by: MarkAckert <[email protected]>

* update cli package to v3

Signed-off-by: MarkAckert <[email protected]>

* remove v2 holddata in playbook and replace it with no-op

Signed-off-by: MarkAckert <[email protected]>

* dropped the PGM

Signed-off-by: MarkAckert <[email protected]>

* update cli version in tests

Signed-off-by: MarkAckert <[email protected]>

* fix the cli match string

Signed-off-by: MarkAckert <[email protected]>

---------

Signed-off-by: MarkAckert <[email protected]>

* Update component versions

Signed-off-by: zowe-robot <[email protected]>

* Update manifest.json.template

Signed-off-by: Timothy Johnson <[email protected]>

* WebUI RC1 v3.1.0

Signed-off-by: James Struga <[email protected]>

* z/OSMF static definition file processing (#4113)

* zosmf static def scheme in attls

Signed-off-by: Pablo Carle <[email protected]>

* pr review

Signed-off-by: Pablo Carle <[email protected]>

* quotes

Signed-off-by: Pablo Carle <[email protected]>

* pr review

Signed-off-by: Pablo Carle <[email protected]>

* pr review

Signed-off-by: Pablo Carle <[email protected]>

---------

Signed-off-by: Pablo Carle <[email protected]>
Co-authored-by: Pablo Carle <[email protected]>

* update client python sdk tag to latest dev release (dev22)

Signed-off-by: MarkAckert <[email protected]>

* update APIML versions

Signed-off-by: Pavel Jareš <[email protected]>

* fix ZAAS version

Signed-off-by: Pavel Jareš <[email protected]>

* update to APIML 3.1.1

Signed-off-by: Pavel Jareš <[email protected]>

* Update zlux-core with attls status 

Signed-off-by: James Struga <[email protected]>

* Update manifest.json.template

Signed-off-by: James Struga <[email protected]>

* update license version

Signed-off-by: MarkAckert <[email protected]>

* check or ebcdic before converting certificate

Signed-off-by: MarkAckert <[email protected]>

* remove hardcoded cer from testing

Signed-off-by: MarkAckert <[email protected]>

* fixed quote

Signed-off-by: MarkAckert <[email protected]>

* remove quotes

Signed-off-by: MarkAckert <[email protected]>

* update upload-artifact action version

Signed-off-by: MarkAckert <[email protected]>

* add scp "-O" option for file transfer

Signed-off-by: MarkAckert <[email protected]>

* Updated zlux-core for RC2

Signed-off-by: James Struga <[email protected]>

* update to APIML 3.1.3

Signed-off-by: Pavel Jareš <[email protected]>

* User/zlatnikp/apimlwf second iteration of apiml workflow for V3 (#4144)

* NewVersion based on different use case

Signed-off-by: pz636264 <[email protected]>

* middleUpdate

Signed-off-by: pz636264 <[email protected]>

* remainingChange

Signed-off-by: pz636264 <[email protected]>

* testNewPc

Signed-off-by: Pavel Zlatnik <[email protected]>

* lastDemoUpdates

Signed-off-by: Pavel Zlatnik <[email protected]>

* retrofitV3Updates

Signed-off-by: Pavel Zlatnik <[email protected]>

* prefix desc update

Signed-off-by: Pavel Zlatnik <[email protected]>

* updated prefix

Signed-off-by: Pavel Zlatnik <[email protected]>

* portReorder and version

Signed-off-by: Pavel Zlatnik <[email protected]>

---------

Signed-off-by: pz636264 <[email protected]>
Signed-off-by: Pavel Zlatnik <[email protected]>
Signed-off-by: MarkAckert <[email protected]>

* update apiml dependencies

Signed-off-by: Pavel Jareš <[email protected]>

* enable debug for the Gateway

Signed-off-by: Pavel Jareš <[email protected]>

* update versions to 3.1.5

Signed-off-by: Pavel Jareš <[email protected]>

* revert trace logs

Signed-off-by: MarkAckert <[email protected]>

* Merge pull request #4154 from zowe/user/zlatnikp/wfpackage

add new APIML wf to PSWI

Signed-off-by: MarkAckert <[email protected]>

* Merge pull request #4161 from zowe/user/zlatnikp/installstep (#4168)

User/zlatnikp/installstep

Signed-off-by: MarkAckert <[email protected]>
Co-authored-by: pavelzlatnik <[email protected]>

---------

Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: Martin Zeithaml <[email protected]>
Signed-off-by: mm667937 <[email protected]>
Signed-off-by: MarkAckert <[email protected]>
Signed-off-by: pz636264 <[email protected]>
Signed-off-by: James Struga <[email protected]>
Signed-off-by: Martin Zeithaml <[email protected]>
Signed-off-by: Mark Ackert <[email protected]>
Signed-off-by: Pavel Zlatnik <[email protected]>
Signed-off-by: JoeNemo <[email protected]>
Signed-off-by: vm635318 <[email protected]>
Signed-off-by: ONNO VAN DEN TROOST <[email protected]>
Signed-off-by: zowe-robot <[email protected]>
Signed-off-by: Timothy Johnson <[email protected]>
Signed-off-by: James Struga <[email protected]>
Signed-off-by: Pablo Carle <[email protected]>
Signed-off-by: Pavel Jareš <[email protected]>
Co-authored-by: 1000TurquoisePogs <[email protected]>
Co-authored-by: Martin Zeithaml <[email protected]>
Co-authored-by: Martin Zeithaml <[email protected]>
Co-authored-by: mm667937 <[email protected]>
Co-authored-by: pz636264 <[email protected]>
Co-authored-by: James Struga <[email protected]>
Co-authored-by: JoeNemo <[email protected]>
Co-authored-by: pavelzlatnik <[email protected]>
Co-authored-by: vm635318 <[email protected]>
Co-authored-by: OnnoVdT <[email protected]>
Co-authored-by: zowe-robot <[email protected]>
Co-authored-by: Timothy Johnson <[email protected]>
Co-authored-by: James Struga <[email protected]>
Co-authored-by: Pablo Carle <[email protected]>
Co-authored-by: Pablo Carle <[email protected]>
Co-authored-by: Pavel Jares <[email protected]>
Co-authored-by: Pavel Jareš <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

PSWI - z/OSMF Workflows: ZWEV2.SZWEEXEC no created
3 participants