-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3998 from zowe/user/muzikovam/zoweYamlDiff
User/muzikovam/zowe yaml diff
- Loading branch information
Showing
16 changed files
with
371 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| name: PSWI zowe.yaml sync check | ||
|
|
||
| permissions: | ||
| id-token: write | ||
| issues: write | ||
| pull-requests: write | ||
| contents: write | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - v3.x/staging | ||
| pull_request: | ||
| types: [opened, synchronize] | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| test-pswi-zowe-yaml: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
|
|
||
| - name: '[Prep 1] Checkout' | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: '[PSI-LOCK] Lock marist servers to build PSWI' | ||
| uses: zowe-actions/shared-actions/lock-resource@main | ||
| with: | ||
| lock-repository: ${{ github.repository }} | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| lock-resource-name: zowe-psi-build-zzow07-lock | ||
| lock-avg-retry-interval: 30 | ||
|
|
||
| - name: 'Test ZWECONF workflow' | ||
| id: zweconf | ||
| timeout-minutes: 30 | ||
| run: | | ||
| cd pswi | ||
| ./ZWECONF_test.sh | ||
| env: | ||
| ZOSMF_USER: ${{ secrets.ZOWE_PSWI_BUILD_USR }} | ||
| ZOSMF_PASS: ${{ secrets.ZOWE_PSWI_BUILD_PASSWD }} | ||
| ZZOW_SSH_PORT: ${{ secrets.SSH_MARIST_ALLSYS_PORT }} | ||
|
|
||
| - name: Store test output | ||
| uses: actions/upload-artifact@v4 | ||
| if: steps.zweconf.outcome != '' && failure() | ||
| with: | ||
| name: zweconf_test | ||
| path: | | ||
| pswi/**.txt | ||
| pswi/zowe_.yaml | ||
| pswi/ZWECONF1/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/bin/sh | ||
| #version=1.0 | ||
|
|
||
| export BASE_URL="${ZOSMF_URL}:${ZOSMF_PORT}" | ||
|
|
||
| echo "" | ||
| echo "" | ||
| echo "Script for testing workflows..." | ||
| echo "Host :" $ZOSMF_URL | ||
| echo "Port :" $ZOSMF_PORT | ||
| echo "SSH Port :" $ZZOW_SSH_PORT | ||
| echo "z/OSMF system :" $ZOSMF_SYSTEM | ||
| echo "Test HLQ :" $TEST_HLQ | ||
| echo "Test mount point :" $TEST_MOUNT | ||
| echo "Work zFS :" $WORK_ZFS # For z/OSMF v2.3 | ||
| echo "Work mount point :" $WORK_MOUNT # For z/OSMF v2.3 | ||
|
|
||
| echo "Mounting ${TEST_HLQ}.ZFS" | ||
| sh scripts/tmp_mounts.sh "${TEST_HLQ}.ZFS" "${TEST_MOUNT}" | ||
| if [ $? -gt 0 ]; then exit -1; fi | ||
|
|
||
| echo "Registering/testing the configuration workflow ${TEST_HLQ}.WORKFLOW(ZWECONF)" | ||
| sh scripts/wf_run_test.sh "${TEST_HLQ}.WORKFLOW(ZWECONF)" | ||
| if [ $? -gt 0 ];then exit -1;fi | ||
|
|
||
| echo "Registering/testing the configuration workflow ${TEST_MOUNT}/files/workflows/ZWECONF.xml" | ||
| sh scripts/wf_run_test.sh "${TEST_MOUNT}/files/workflows/ZWECONF.xml" | ||
| if [ $? -gt 0 ];then exit -1;fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| export ZOSMF_URL="https://zzow07.zowe.marist.cloud" | ||
| export ZOSMF_PORT=10443 | ||
| export ZOSMF_SYSTEM="S0W1" | ||
| export JOBNAME="ZWECONF1" | ||
| export HOST=${ZOSMF_URL#https:\/\/} | ||
| export BASE_URL="${ZOSMF_URL}:${ZOSMF_PORT}" | ||
| WORK_MOUNT="/tmp" | ||
|
|
||
| echo "Changing runtime path in ZWECONF.properties." | ||
|
|
||
| cp ../workflows/files/ZWECONF.properties ./ZWECONF.properties | ||
| sed "s|runtimeDirectory=|runtimeDirectory=${WORK_MOUNT}|g" ./ZWECONF.properties > _ZWECONF | ||
| sed "s|java_home=|java_home=#delete_me#|g" _ZWECONF > ZWECONF | ||
| sed "s|node_home=|node_home=#delete_me#|g" ZWECONF > _ZWECONF | ||
|
|
||
| echo "Changing the configuration workflow to be fully automated." | ||
|
|
||
| cp ../workflows/files/ZWECONF.xml ./ZWECONF.xml | ||
| sed "s|<autoEnable>false|<autoEnable>true|g" ./ZWECONF.xml > ZWECONFX | ||
|
|
||
| sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF | ||
| cd ${WORK_MOUNT} | ||
| put _ZWECONF | ||
| put ZWECONFX | ||
| EOF | ||
|
|
||
| echo "Testing the configuration workflow ${WORK_MOUNT}/ZWECONFX" | ||
| sh scripts/wf_run_test.sh "${WORK_MOUNT}/ZWECONFX" "run" "ZWECONF" "${WORK_MOUNT}/_ZWECONF" | ||
| if [ $? -gt 0 ];then exit -1;fi | ||
|
|
||
| echo "Converting zowe.yaml" | ||
|
|
||
| echo "//${ZOSMF_SYSTEM} JOB (1),'PSWI',MSGCLASS=A,REGION=0M" > JCL | ||
| echo "/*JOBPARM SYSAFF=(${ZOSMF_SYSTEM})" >> JCL | ||
| echo "//UNPAXDIR EXEC PGM=BPXBATCH" >> JCL | ||
| echo "//STDOUT DD SYSOUT=*" >> JCL | ||
| echo "//STDERR DD SYSOUT=*" >> JCL | ||
| echo "//STDPARM DD *" >> JCL | ||
| echo "SH set -x;set -e;" >> JCL | ||
| echo "cd ${WORK_MOUNT};" >> JCL | ||
| echo "iconv -f IBM-1047 -t ISO8859-1 zowe.yaml > zowe_.yaml;" >> JCL | ||
| echo "/*" >> JCL | ||
|
|
||
| sh scripts/submit_jcl.sh "`cat JCL`" | ||
| if [ $? -gt 0 ];then exit -1;fi | ||
| rm JCL | ||
|
|
||
| sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF | ||
| cd ${WORK_MOUNT} | ||
| get zowe_.yaml | ||
| rm zowe_.yaml | ||
| EOF | ||
|
|
||
| pwd | ||
|
|
||
| cp ../example-zowe.yaml example-zowe.yaml | ||
|
|
||
| diff --ed example-zowe.yaml zowe_.yaml > diff.txt || true | ||
|
|
||
| diff --ed diff.txt scripts/base_diff.txt > final_diff.txt |
Oops, something went wrong.