From bd788d6f769e137dacb45402316a20aa3e753a85 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Wed, 18 Dec 2024 09:12:53 -0500 Subject: [PATCH] Fix v3 PTF Build (#4111) * found some lingering azwe002 references Signed-off-by: MarkAckert * update cli package to v3 Signed-off-by: MarkAckert * remove v2 holddata in playbook and replace it with no-op Signed-off-by: MarkAckert * dropped the PGM Signed-off-by: MarkAckert * update cli version in tests Signed-off-by: MarkAckert * fix the cli match string Signed-off-by: MarkAckert --------- Signed-off-by: MarkAckert --- .github/workflows/build-packaging.yml | 2 +- .github/workflows/cicd-test.yml | 2 +- playbooks/install-fmid.yml | 2 +- playbooks/roles/ptf/templates/HOLDDATA.jcl.j2 | 29 ++++--------------- tests/installation/src/constants.ts | 2 +- tests/sanity/test/cli/test-01-version.js | 2 +- 6 files changed, 10 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml index 73e526a4f3..a5bd922b52 100644 --- a/.github/workflows/build-packaging.yml +++ b/.github/workflows/build-packaging.yml @@ -351,7 +351,7 @@ jobs: - 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' diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 0e3a32e054..191197433f 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -65,7 +65,7 @@ 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_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 diff --git a/playbooks/install-fmid.yml b/playbooks/install-fmid.yml index 715838ec28..0c2602776b 100644 --- a/playbooks/install-fmid.yml +++ b/playbooks/install-fmid.yml @@ -60,7 +60,7 @@ # ============================================================================ # if zowe_build_remote is set, we copy the FMID from zowe_fmids_dir_remote to our work folder - # the value of zowe_build_remote should be FMID like AZWE002 + # the value of zowe_build_remote should be FMID like AZWE003 - name: Copy Zowe FMID files from {{ zowe_fmids_dir_remote }}/{{ zowe_build_remote }} if it has value when: zowe_build_remote is defined import_role: diff --git a/playbooks/roles/ptf/templates/HOLDDATA.jcl.j2 b/playbooks/roles/ptf/templates/HOLDDATA.jcl.j2 index dcd56f1979..927a40c9d5 100644 --- a/playbooks/roles/ptf/templates/HOLDDATA.jcl.j2 +++ b/playbooks/roles/ptf/templates/HOLDDATA.jcl.j2 @@ -1,24 +1,5 @@ -//SZWELOAD JOB -// EXPORT SYMLIST=(TZON,TRGT) -// SET TRGT={{ zowe_smpe_hlq_tzone }} -// SET SMPE={{ zowe_smpe_hlq_csi }} -// SET TZON=TZONE -//UCLIN EXEC PGM=GIMSMP,REGION=0M,COND=(4,LT) -//SZWELOAD DD SPACE=(TRK,(30,15,15)), -// UNIT=SYSALLDA, -// DISP=(MOD,CATLG), -// DSNTYPE=LIBRARY, -// RECFM=U, -// LRECL=0, -// BLKSIZE=32760, -// DSN=&TRGT..SZWELOAD -//SMPCSI DD DISP=OLD,DSN={{ smpe_csi }} -//SMPCNTL DD *,SYMBOLS=JCLONLY - SET BDY(&TZON). - UCLIN. - ADD DDDEF (SZWELOAD) - DATASET(&TRGT..SZWELOAD) - UNIT(SYSALLDA) - WAITFORDSN - SHR . - ENDUCL. +//HOLDDATA JOB +//* This job can be customized if holddata actions are added to Zowe PTFs +//* For example, adding a new load module to an SMP/e-managed dataset. +//DUMMY EXEC PGM=IEFBR14 +//* diff --git a/tests/installation/src/constants.ts b/tests/installation/src/constants.ts index c60aa86853..afe1dd8e07 100644 --- a/tests/installation/src/constants.ts +++ b/tests/installation/src/constants.ts @@ -13,7 +13,7 @@ import * as path from 'path'; // const debug = Debug('zowe-install-test:constants'); // the FMID we will use to test PTF -export const ZOWE_FMID = 'AZWE002'; +export const ZOWE_FMID = 'AZWE003'; // where ansible playbooks located export const ANSIBLE_ROOT_DIR: string = path.resolve(__dirname, '../../../playbooks'); diff --git a/tests/sanity/test/cli/test-01-version.js b/tests/sanity/test/cli/test-01-version.js index 9b52be55ed..861fde287b 100644 --- a/tests/sanity/test/cli/test-01-version.js +++ b/tests/sanity/test/cli/test-01-version.js @@ -28,6 +28,6 @@ describe('cli version', function() { expect(result).to.have.property('stderr'); expect(result.stderr).to.be.empty; - expect(result.stdout).to.match(/^7\./); + expect(result.stdout).to.match(/^CLI Version: 8\./); }); });