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.

Sign up for GitHub

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

Jump to bottom

Backport v1.x master to staging #3860

Merged
merged 65 commits into from
Jun 13, 2024
Merged

Backport v1.x master to staging #3860

merged 65 commits into from
Jun 13, 2024

Conversation

MarkAckert
Copy link
Member

This PR captures some changes from the v1 release activities and backports them to staging.

In focus:

  • Updates to the automation which fixes the install-ptf playbooks.

James Struga and others added 30 commits March 28, 2024 09:50
WebUI v1.28.6 RC1
97126ea 
Signed-off-by: James Struga <[email protected]>
Update zss
443d94f 
Signed-off-by: James Struga <[email protected]>
@achmelo
apiml 1.28.6 rc1
ea14795 
Signed-off-by: achmelo <[email protected]>
@MarkAckert
Merge pull request #3782 from zowe/user/markackert/v1-staging-to-rc
e883d42 
User/markackert/v1 staging to rc
@MarkAckert
Merge branch 'v1.x/rc' into reboot/apiml_1-28-6-rc1
5763f55 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge branch 'v1.x/rc' into users/jstruga/v1.28.6-RC1
127b063 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3780 from zowe/reboot/apiml_1-28-6-rc1
a935424 
apiml 1.28.6 rc1
@MarkAckert
Merge branch 'v1.x/rc' into users/jstruga/v1.28.6-RC1
9ecf4a6
@MarkAckert
Merge pull request #3778 from zowe/users/jstruga/v1.28.6-RC1
54f90ea 
WebUI v1.28.6 RC1
@zowe-robot
Update component versions
c2d61b3 
Signed-off-by: zowe-robot <[email protected]>
@MarkAckert
Merge pull request #3783 from zowe/v1.28.6/cli/rc
628970f 
Update CLI component versions for 1.28.6
@MarkAckert
lock in files, jobs, datasets explorer artifacts
bb10934 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3786 from zowe/user/markackert/explorer-updates
67761de 
Update explorer artifacts
@ManjuVNair133
update manifest.json.template file for v1.28.6
cb87f83 
Signed-off-by: ManjuVNair133 <[email protected]>
@ojcelis
update imageDependencies zowe-launch-scripts
6adac38 
Signed-off-by: ojcelis <[email protected]>
@MarkAckert
Merge pull request #3791 from zowe/manifestimagesfor1.28.6
7b649dc 
update manifest.json.template file for v1.28.6
@MarkAckert
update licenses package
3fa6a30 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3793 from zowe/user/markackert/1.28.6-rc-to-master
1043670 
Prepare for 1.28.6 release
@MarkAckert
remove imperative (now in zowe-cli)
ed57832 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge branch 'v1.x/master' into user/markackert/1.28.6-rc-to-master
f7835d0
@MarkAckert
Merge pull request #3794 from zowe/user/markackert/1.28.6-rc-to-master
2a145d1 
remove imperative (now in zowe-cli)
@MarkAckert
update cics cli repo
6e2aa28 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3795 from zowe/user/markackert/update-sourceDeps-v1
802ab3e 
update cics cli repo
@MarkAckert
fix remaining versions
c9e85d9 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3796 from zowe/user/markackert/v1x-final-version-…
7261c49 
…fixes

fix remaining versions
@MarkAckert
fix zowe vscode repo name
d8da66c 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3797 from zowe/user/markackert/fix-vscode-sourced…
4e4e03b 
…eps-repo

fix zowe vscode repo name
@zowe-robot
Update component versions
c182af8 
Signed-off-by: zowe-robot <[email protected]>
@achmelo
API ML 1.28.7 rc1
311b525 
Signed-off-by: achmelo <[email protected]>
@achmelo
API ML 1.28.7 rc1
521c376 
Signed-off-by: achmelo <[email protected]>
MarkAckert and others added 19 commits May 30, 2024 16:33
@MarkAckert
Merge branch 'v1.x/rc' into useers/jstruga/webui-rc1
c8b80c9
@MarkAckert
Merge pull request #3841 from zowe/useers/jstruga/webui-rc1
0bc15c5 
WebUI 1.28.7 RC1
@MarkAckert
skip fmid config step for ptf tests
6a5ba95 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3846 from zowe/user/markackert/ptf-build-fixes-v1
8ed7297 
Fix PTF Test Errors in v1.x
@MarkAckert
address build failure
0184e37 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
debug content
2c324e0 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
move certificate setup post-ptf
cb4bf43 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
move to configptf
5dfa917 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
small fixes
0709296 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
try skipping old configfmid
83a8ca8 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
remove validate_configuration check
5cf6328 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge branch 'v1.x/rc' into user/markackert/ptf-build-fixes-v1
9081114
@MarkAckert
remove debug, add more conversions
52fe1f7 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3849 from zowe/user/markackert/ptf-build-fixes-v1
4df918a 
PTF Build Failure (part 2)
@MarkAckert
merge v1.x/rc in to v1.x/master
7cfcbdd 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
Merge pull request #3855 from zowe/user/markackert/rc-to-master-1.28.7
b9e15cd 
1.28.7 rc to master
@MarkAckert
Merge branch 'v1.x/master' into user/markackert/backport-v1x-master-t…
3c1d736 
…o-staging

Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
update zowe version for staging
e97ba12 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert
fix manifest for staging
e7d674e 
Signed-off-by: MarkAckert <[email protected]>
@MarkAckert MarkAckert requested a review from struga0258 June 12, 2024 12:02
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 12, 2024 •
edited
Loading

PAX build 5418 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/9482173375

@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 12, 2024 •
edited
Loading

Test workflow 4734 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/1.28.8-PR-3860/zowe-1.28.8-pr-3860-5418-20240612120912.pax
Running on machine: zzow07
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/9482290567

@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 13, 2024 •
edited
Loading

PAX build 5426 SUCCEEDED.
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/9502673126

@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 13, 2024 •
edited
Loading

Test workflow 4744 is started.
Running install test: Convenience Pax
The zowe artifact being used by this test workflow: libs-snapshot-local/org/zowe/1.28.8-PR-3860/zowe-1.28.8-pr-3860-5426-20240613154759.pax
Running on machine: zzow06
Result: SUCCESS
Link to workflow run: https://github.com/zowe/zowe-install-packaging/actions/runs/9502764862

@MarkAckert MarkAckert merged commit 5c2ee1f into v1.x/staging Jun 13, 2024
37 checks passed
@MarkAckert MarkAckert deleted the user/markackert/backport-v1x-master-to-staging branch June 13, 2024 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@struga0258 struga0258 struga0258 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@MarkAckert @struga0258 @zowe-robot @achmelo @ManjuVNair133 @ojcelis