Skip to content

Commit

Permalink
3.1 release -> master (#4170)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
18 people authored Feb 3, 2025
1 parent c39ba1e commit 83fe180
Show file tree
Hide file tree
Showing 99 changed files with 3,175 additions and 1,599 deletions.
12 changes: 12 additions & 0 deletions .github/lychee.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This lychee configuration tries to find dead links in zwe, pswi, and smpe files which may be displayed to the user.
# This does not focus on dead links for internal-facing documentation, e.g. README.md.

# We're including language sources as well as document files since the language sources embed URLs
# which can be displayed to the user, e.g. 'zwe' shell script commands displaying help information.

exclude_path = ['smpe/bld/service/_README_sample_sysmod_builds.docx']
# This exclude list covers known urls which should be ignored, including ones which contained
# templated values in typescript. The templates are covered by a wildcard.
exclude = [ 'https://www.eclipse.org/legal/epl-v20.html', 'https://zowe.org/schemas/*', 'https://www.zowe.org/schemas/*', 'https://discovery', 'https://github.com/zowe/launcher/blob/*', 'https://myregistry/url$', 'https://your-zos-host-name/zosmf/*{1,60}', '^http://service.software.ibm.com/holdata/390holddata.html', ]

hidden = true
17 changes: 8 additions & 9 deletions .github/scripts/cicd_test/make_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,14 @@ case $install_test_choice in
test_file="$KEYRING_TESTFILE"
;;

"z/OS node v18")
test_file="$ZOS_NODE_V18_TESTFILE"
test_force_system="zzow08"
;;

"z/OS node v20")
test_file="$ZOS_NODE_V20_TESTFILE"
;;

"z/OS node v22")
test_file="$ZOS_NODE_V22_TESTFILE"
;;

"Non-strict Verify External Certificate")
test_file="$NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE"
;;
Expand Down Expand Up @@ -87,18 +86,18 @@ if [[ ! -z "$test_force_system" ]]; then
else
if [[ -z "$dont_parse_test_server" ]]; then
if [[ "$test_server" == "Any zzow servers" ]]; then
test_server="zzow0"$(echo $(($RANDOM % 3 + 6)))
test_server="zzow"$(printf %02d $(($RANDOM % 3 + 9)))
fi
TEST_FILE_SERVER="$test_file($test_server)"
else
any_occurrence=$(echo $test_file | grep -o "(any)" | wc -l)
interim_test_file_server=$test_file
for i in $(seq $any_occurrence); do
# Generates zzow06, zzow07, zzow08
interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow0$(echo $(($RANDOM % 3 + 6))))#")
# Generates zzow09, zzow10, zzow11
interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow$(printf %02d $(($RANDOM % 3 + 9))))#")
done

TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow06,zzow07,zzow08)#g")
TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow09,zzow10,zzow11)#g")
fi
fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ TEST_SERVER=$(echo "$MATRIX_SERVER" | cut -d "-" -f2)

case $TEST_SERVER in

"zzow06")
TEST_SERVER_NICKNAME=marist-6
"zzow09")
TEST_SERVER_NICKNAME=marist-9
;;

"zzow07")
TEST_SERVER_NICKNAME=marist-7
"zzow10")
TEST_SERVER_NICKNAME=marist-10
;;

"zzow08")
TEST_SERVER_NICKNAME=marist-8
"zzow11")
TEST_SERVER_NICKNAME=marist-11
;;

*)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@ if [[ "$MATRIX_TEST" == *"install-ext"* ]]; then
if [[ "$each_ext" == *"("* ]] && [[ "$each_ext" == *")"* ]] ; then
# user provides custom artifactory pattern
ext_name=$(echo "$each_ext" | cut -d "(" -f1)
ext_pattern=$(echo "$each_ext" | cut -d "(" -f2 | cut -d ")" -f1)
ext_version=$(echo "$each_ext" | cut -d "(" -f2 | cut -d ")" -f1)
ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g" | sed "s#{ext-version}#$ext_version#g" )
else
# use default
ext_name="$each_ext"
ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g")
ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g" | sed "s#{ext-version}#*#g" )
fi

echo "[Check 4 INFO] extension name is $ext_name"
Expand All @@ -58,4 +59,4 @@ if [[ "$MATRIX_TEST" == *"install-ext"* ]]; then
EXTENSION_LIST=$(echo $EXTENSION_LIST | sed 's/;$//g')
assert_env_var EXTENSION_LIST
printf "${GREEN}[Check 4/$TOTAL_CHECK] Zowe extension list processing complete!${NC}\n"
fi
fi
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Set outputs
echo ZOWE_ARTIFACTORY_FINAL=$ZOWE_ARTIFACTORY_FINAL >>$GITHUB_OUTPUT
echo ZOWE_ARTIFACTORY_FINAL_FILENAME=$ZOWE_ARTIFACTORY_FINAL_FILENAME >>$GITHUB_OUTPUT
echo NODE_HOME_PATTERN=/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x >>$GITHUB_OUTPUT
echo NODE_HOME_PATTERN=/ZOWE/node/node-$ZOS_NODE_VERSION >>$GITHUB_OUTPUT
echo TEST_SERVER=$TEST_SERVER >>$GITHUB_OUTPUT
echo TEST_SERVER_NICKNAME=$TEST_SERVER_NICKNAME >>$GITHUB_OUTPUT
echo EXTENSION_LIST=$EXTENSION_LIST >>$GITHUB_OUTPUT
Expand All @@ -28,4 +28,4 @@ printf "Zowe CLI artifactory path: ${CYAN}$ZOWE_CLI_ARTIFACTORY_FINAL${NC}\n"
printf "Zowe extension list: ${CYAN}$EXTENSION_LIST${NC}\n"
printf "Test server: ${CYAN}$TEST_SERVER${NC}\n"
printf "Test server nickname: ${CYAN}$TEST_SERVER_NICKNAME${NC}\n"
printf "Node home pattern on z/OS: ${CYAN}/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x${NC}\n"
printf "Node home pattern on z/OS: ${CYAN}/ZOWE/node/node-$ZOS_NODE_VERSION${NC}\n"
9 changes: 5 additions & 4 deletions .github/workflows/build-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ jobs:
echo "run_build=${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.ORIGIN_ISSUE_TRIGGER == 'false') || !contains(fromJson(steps.get-labels.outputs.result), 'Build: None') }}" >> $GITHUB_OUTPUT
- id: check-test
name: 'export conditional used to determine if we should run a test suite'
# run_test explanation: if we set "run_build" from the prior step and this is a PR, run unless "Test: None" label is present. If not initiated from a PR, only build.
run: |
echo "run_test=${{ (steps.check-build.outputs.run_build == 'true' && !contains(fromJson(steps.get-labels.outputs.result), 'Test: None')) }}" >> $GITHUB_OUTPUT
echo "run_test=${{ (steps.check-build.outputs.run_build == 'true' && github.event_name != 'workflow_dispatch' && !contains(fromJson(steps.get-labels.outputs.result), 'Test: None')) }}" >> $GITHUB_OUTPUT
display-dispatch-event-id:
if: github.event.inputs.RANDOM_DISPATCH_EVENT_ID != ''
Expand Down Expand Up @@ -344,13 +345,13 @@ jobs:
with:
lock-repository: ${{ github.repository }}
github-token: ${{ secrets.GITHUB_TOKEN }}
lock-resource-name: zowe-psi-build-zzow07-lock
lock-resource-name: zowe-psi-build-zzow10-lock
lock-avg-retry-interval: 60

- name: '[PSWI 0] PSWI pre-build check for existing smpe'
if: env.INPUTS_BUILD_PSWI == 'true' && github.event.inputs.PSWI_SMPE_ARTIFACTORY_PATH != '' && github.event.inputs.PSWI_SMPE_AZWE_ARTIFACTORY_PATH != ''
run: |
jfrog rt dl ${{github.event.inputs.PSWI_SMPE_AZWE_ARTIFACTORY_PATH}}/AZWE002*.zip --flat=true .pax/AZWE002.zip
jfrog rt dl ${{github.event.inputs.PSWI_SMPE_AZWE_ARTIFACTORY_PATH}}/AZWE003*.zip --flat=true .pax/AZWE003.zip
jfrog rt dl ${{github.event.inputs.PSWI_SMPE_ARTIFACTORY_PATH}}/zowe-smpe-*.zip --flat=true .pax/zowe-smpe.zip
- name: '[SMPE Pax 4] Build PSWI'
Expand All @@ -373,7 +374,7 @@ jobs:
with:
name: pswi-folder
path: |
pswi/**
pswi/logs/**
- name: '[K8S] Build Kubernetes'
timeout-minutes: 10
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/cicd-test-readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ This guide will describe how you should input into Github Actions workflow input

Currently we support three testing z/OS servers:

- zzow06 (ACF2)
- zzow07 (Top Secret/TSS)
- zzow08 (RACF)
- zzow09 (ACF2)
- zzow10 (Top Secret/TSS)
- zzow11 (RACF)

Testing pipeline is running tests in parallel. The workflow will try to acquire the resource lock if available. If the resource lock is occupied, the workflow will wait until the lock is succesfully acquired.

Expand All @@ -17,7 +17,7 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin
### Choose Test Server

- This input is a choice, and it's mandatory.
- You can choose from one of `zzow06`, `zzow07`, `zzow08`, `zzow06,zzow07,zzow08` (if you want to run the test on all zzow servers), or `Any zzow servers` (pick any zzow servers, potentially help reduce wait time)
- You can choose from one of `zzow09`, `zzow10`, `zzow11`, `zzow09,zzow10,zzow11` (if you want to run the test on all zzow servers), or `Any zzow servers` (pick any zzow servers, potentially help reduce wait time)
- Default is `Any zzow servers`

### Choose Install Test
Expand All @@ -29,7 +29,7 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin
- SMPE PTF
- Extensions
- Keyring
- z/OS node v18
- z/OS node v20
- Non-strict Verify External Certificate
- Install PTF twice
- VSAM Caching storage method
Expand Down Expand Up @@ -91,7 +91,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins
- This input is pre-filled with `sample-node-api;sample-trial-app` to test [sample-node-api](https://github.com/zowe/sample-node-api) and [sample-trial-app](https://github.com/zowe/sample-trial-app) projects. In normal circumstances, you probably don't need to modify the pre-filled value here.
- By default, the extension artifact search pattern is using format `libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax` where `{ext-name}` will be processed and substituted from this input (as an example above, `sample-node-api`). Then the latest uploaded artifact will be used.
- Optionally, you can customized your extension artifact path. Customized jfrog artifactory path should exist, be valid, and enclosed in brackets and put after the extension name, eg. `sample-node-api(my/new/path/sample-node-api-cus.pax)`. A pattern contains `*` is also supported, which the latest artifact will be picked up. If multiple extensions are included, make sure to separate them by semi-colon. In addition to the artifactory path/pattern, you can also put a full http URL to any other remote location that points to an extension pax here.
- Optionally, you can customized your extension artifact version. Customized jfrog artifactory version should exist, be valid, and enclosed in brackets and put after the extension name, eg. `sample-node-api(3.0.0-SNAPSHOT)`. This example will create a search pattern like the following, where the latest artifact in the folder is picked up: `libs-snapshot-local/org/zowe/sample-node-api/3.0.0-SNAPSHOT/sample-node-api-*.pax`. A pattern containing `*` is also supported, which will result in the latest artifact in the latest folder matching the pattern. For example: `sample-node-api(1.0.0-*)` will create this search pattern: `libs-snapshot-local/org/zowe/sample-node-api/1.0.0-*/sample-node-api-*.pax`, which could match folders `1.0.0-SNAPSHOT`, `1.0.0-MAIN`, `1.0.0-user-pr-build`, etc.
- The following regular expression will be used to check against your input
```
Expand All @@ -109,7 +109,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins
When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 21 independent jobs will be spawned.
```
basic/install.ts(zzow06,zzow07,zzow08);basic/install-ptf.ts(zzow06,zzow07,zzow08);basic/install-ext.ts(zzow07);extended/keyring.ts(zzow06,zzow07,zzow08);extended/node-versions/node-v18.ts(zzow06,zzow07,zzow08);extended/node-versions/node-v20.ts(zzow06,zzow07,zzow08);extended/certificates/nonstrict-verify-external-certificate.ts(zzow06)
basic/install.ts(zzow09,zzow10,zzow11);basic/install-ptf.ts(zzow09,zzow10,zzow11);basic/install-ext.ts(zzow10);extended/keyring.ts(zzow09,zzow10,zzow11);extended/node-versions/node-v20.ts(zzow09,zzow10,zzow11);extended/node-versions/node-v20.ts(zzow09,zzow10,zzow11);extended/certificates/nonstrict-verify-external-certificate.ts(zzow09)
```
Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours.
Expand All @@ -121,7 +121,6 @@ Selected test running elapsed time:
| ---- | ------------ |
| Convenience Pax | 53m |
| SMPE PTF | 68m |
| z/OS node v18 | 45m |
| z/OS node v20 | 45m |
| Keyring | 53m |
| Non-strict Verify External Certificate | 51m |
Expand Down
31 changes: 14 additions & 17 deletions .github/workflows/cicd-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ on:
default: 'Any zzow servers'
options:
- Any zzow servers
- zzow06
- zzow07
- zzow08
- zzow06,zzow07,zzow08
- zzow09
- zzow10
- zzow11
- zzow09,zzow10,zzow11
install-test:
description: 'Choose Install Test'
type: choice
Expand All @@ -31,8 +31,8 @@ on:
- SMPE PTF
- Extensions
- Keyring
- z/OS node v18
- z/OS node v20
- z/OS node v22
- Non-strict Verify External Certificate
- Install PTF Twice
- VSAM Caching Storage Method
Expand All @@ -52,7 +52,7 @@ on:
required: false
# FIXME: too slow to test 2, temporarily only test 1
# default: 'sample-node-api;sample-trial-app'
default: 'sample-node-api'
default: 'sample-node-api(3.0.0-SNAPSHOT)'
RANDOM_DISPATCH_EVENT_ID:
description: 'random dispatch event id'
required: false
Expand All @@ -65,12 +65,12 @@ env:
SANITY_TEST_PATH: tests/sanity
DEFAULT_ZOWE_PAX_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/*zowe*{branch-name}*.pax
DEFAULT_ZOWE_SMPE_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/*zowe-smpe*{branch-name}*.zip
DEFAULT_ZOWE_CLI_ARTIFACTORY_PATTERN: PLACE_HOLDER/org/zowe/cli/zowe-cli-package/*zowe-cli-package-2*.zip
DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax
DEFAULT_ZOWE_CLI_ARTIFACTORY_PATTERN: PLACE_HOLDER/org/zowe/cli/zowe-cli-package/*zowe-cli-package-3*.zip
DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/{ext-version}/{ext-name}-*.pax

# below block can be overwritten, adjusted by DevOps only
# ZOS_NODE_VERSION more to choose from: v16.20.1, v18.16.0
ZOS_NODE_VERSION: v16.20.1
# ZOS_NODE_VERSION more to choose from: v18.16.0, v20.11.0
ZOS_NODE_VERSION: v18.16.0
CLIENT_NODE_VERSION: v12.18.3
INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:*
SANITY_TEST_DEBUG_INFORMATION: zowe-sanity-test:*
Expand All @@ -81,16 +81,16 @@ env:
SMPE_PTF_TESTFILE: basic/install-ptf.ts
EXTENSIONS_TESTFILE: basic/install-ext.ts
KEYRING_TESTFILE: extended/keyring.ts
ZOS_NODE_V18_TESTFILE: extended/node-versions/node-v18.ts
ZOS_NODE_V20_TESTFILE: extended/node-versions/node-v20.ts
ZOS_NODE_V22_TESTFILE: extended/node-versions/node-v22.ts
NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE: extended/certificates/nonstrict-verify-external-certificate.ts
INSTALL_PTF_TWICE_TESTFILE: extended/install-ptf-two-times.ts
VSAM_CACHING_STORAGE_METHOD_TESTFILE: extended/caching-storages/vsam-storage.ts
INFINISPAN_CACHING_STORAGE_METHOD_TESTFILE: extended/caching-storages/infinispan-storage.ts
CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts
GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts
ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-fmid.ts(all)
ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-fmid.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow08):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any)
ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all)
ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v20.ts(any);extended/node-versions/node-v22.ts(any);extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any)

jobs:
display-dispatch-event-id:
Expand Down Expand Up @@ -298,9 +298,6 @@ jobs:
case 'Keyring':
eta = 53
break;
case 'z/OS node v18':
eta = 45
break;
case 'z/OS node v20':
eta = 45
break;
Expand Down Expand Up @@ -385,7 +382,7 @@ jobs:
- name: '[After Test 2] Upload test report'
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: InstallTestReports-${{ env.TEST_NAME }}-${{ steps.more-test-prep.outputs.TEST_SERVER_NICKNAME }}-${{ github.run_id }}-${{ env.CURRENT_TIME }}
path: ${{ env.INSTALL_TEST_PATH }}/reports/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/diff-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: '[Build] Make diff'
run: git diff ${{ env.FROM }} ${{ env.TO }} -- schemas > schemas.diff
- name: '[Upload]'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: schemas.diff
path: schemas.diff
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/diff-yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: '[Build] Make diff'
run: git diff ${{ env.FROM }} ${{ env.TO }} -- example-zowe.yaml > example-yaml.diff
- name: '[Upload]'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: example-yaml.diff
path: example-yaml.diff
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/link-check-weekly.yml

This file was deleted.

49 changes: 49 additions & 0 deletions .github/workflows/link-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# This link checker focuses on covering end-user facing links, not developer documentation.
# This means we cover the smp/e, pswi, and zwe content.
# The lychee toml files are set to ignore links which popped up in comments or variables.
permissions: read-all

name: Link Check CI

on:
pull_request:
types: [opened, synchronize]
push:
branches:
- 'v3.x/staging'
- 'v2.x/staging'
workflow_dispatch:

jobs:
lychee-link-check:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@f81112d0d2814ded911bd23e3beaa9dda9093915 # v2.1.0
with:
fail: true
format: json
output: lychee_output.json
args: --config ./.github/lychee.toml --no-progress --verbose --max-retries 10 'bin/**/*' 'smpe/**/*' 'workflows/**/*'

- name: Output failed links in console
id: quick-output
if: always()
run: |
if [[ -f "lychee_output.json" ]]; then
jq .fail_map lychee_output.json
else
echo "lychee command failed and didn't produce output"
fi
- name: Publish Output
id: publish
if: always()
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
with:
name: lychee_results.json
path: lychee_output.json
Loading

0 comments on commit 83fe180

Please sign in to comment.