Backport v1.x master to staging

manifest.json.template

@@ -1,6 +1,6 @@
 {
   "name": "Zowe",
-  "version": "1.28.7",
+  "version": "1.28.8",
   "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.",
   "license": "EPL-2.0",
   "homepage": "https://zowe.org",
@@ -136,19 +136,12 @@
       "version": "~0.0.8-SNAPSHOT"
     },
     "org.zowe.licenses": {
-      "version": "1.28.1",
+      "version": "1.28.7",
       "artifact": "zowe_licenses_full.zip"
     }
   },
   "sourceDependencies": [
-    {
-      "componentGroup": "Imperative CLI Framework for Zowe",
-      "entries": [{
-        "repository": "imperative",
-        "tag": "zowe-v1-lts",
-        "destinations": ["Zowe CLI Package"]
-      }]
-    }, {
+     {
       "componentGroup": "Zowe API Mediation Layer",
       "entries": [{
         "repository": "api-layer",

playbooks/README.md

@@ -261,6 +261,8 @@ $ ansible-playbook -l <server> show-logs.yml -v
 - **zowe_auto_create_user_group**: A boolean value to enable or disable creating Zowe user and group. Default value is `false`.
 - **zowe_configure_skip_zwesecur**: A boolean value to skip running `ZWESECUR` job when configure Zowe instance.
 - **zos_keystore_mode**: An optional string to configure Zowe instance to store certificates into Keyring instead of keystore. Valid values are `<empty>` (default value) or `KEYSTORE_MODE_KEYRING`.
+- **convert_upload**: A boolean value to convert uploaded scripts from ASCII to EBCDIC post-transfer. Required for some distros, such as MacOSX. Default value is `false`.
+- **skip_configfmid**: A boolean value to skip automatically configuring Zowe after FMID installation. Default value is `false`.
 - **skip_start**: A boolean value to skip automatically starting Zowe after installation. Default value is `false`.
 - **zowe_uninstall_before_install**: If you want to uninstall Zowe before installing a new version. Default value is `true`.
 - **ZOWE_COMPONENTS_UPGRADE**: An optional boolean value to enable upgrading Zowe components to the latest version. If set to `true`,

playbooks/install-fmid.yml

@@ -1,5 +1,5 @@
 ---
-- name: Install Zowe SMPE FMID
+- name: Install Zowe SMPE FMID.
   hosts: all
   gather_facts: false
   become: false
@@ -78,14 +78,3 @@
   - import_role:
       name: fmid
       tasks_from: overwrite_vars
-
-  # ============================================================================
-  # Configure Zowe
-  - import_role:
-      name: configfmid
-
-  # ============================================================================
-  # Start Zowe
-  - import_role:
-      name: start
-    when: not skip_start|default(False)

playbooks/install-ptf.yml

@@ -61,6 +61,7 @@
       name: fmid
       tasks_from: overwrite_vars
 
+
   # ============================================================================
   # FIXME
   - name: Check if zowe_keystore_dir has a value
@@ -75,12 +76,6 @@
   - import_role:
       name: configure
 
-  # ============================================================================
-  - name: Test upgraded configuration
-    import_role:
-      name: configfmid
-      tasks_from: validate_configuration
-
   # ============================================================================
   # Start Zowe
   - import_role:

playbooks/roles/configfmid/tasks/install_proc.yml → playbooks/roles/configptf/tasks/install_proc.yml

@@ -7,4 +7,4 @@
   vars:
     script_chdir: "{{ zowe_root_dir }}/scripts/utils"
     script_filename: ./zowe-install-proc.sh
-    script_parameters: "\"{{ zowe_dataset_prefix }}\" \"{{ zowe_proclib_dsname }}\""
+    script_parameters: -d {{ zowe_dataset_prefix }} -r {{ zowe_proclib_dsname }}

playbooks/roles/configfmid/tasks/install_xmem_server.yml → playbooks/roles/configptf/tasks/install_xmem_server.yml

@@ -31,7 +31,7 @@
   vars:
     script_chdir: "{{ zowe_root_dir }}/scripts/utils"
     script_filename: ./zowe-install-xmem.sh
-    script_parameters: "\"{{ zowe_dataset_prefix }}\" \"{{ zowe_xmem_loadlib }}\" \"{{ zowe_xmem_parmlib }}\" \"{{ zowe_xmem_proclib }}\""
+    script_parameters: -d {{ zowe_xmem_loadlib }} -a {{ zowe_xmem_parmlib }} -r {{ zowe_xmem_proclib }}
 
 - name: Show content of ZSS proc {{ zowe_xmem_proclib_member_zss }}
   raw: cat "//'{{ zowe_xmem_proclib }}({{ zowe_xmem_proclib_member_zss }})'"

playbooks/roles/configfmid/tasks/main.yml → playbooks/roles/configptf/tasks/main.yml

@@ -45,32 +45,26 @@
 # ============================================================================
 # Install Zowe proc
 - import_role:
-    name: configfmid
+    name: configptf
     tasks_from: install_proc
 
 # ============================================================================
 # Install Cross Memory Server
 - import_role:
-    name: configfmid
+    name: configptf
     tasks_from: install_xmem_server
   vars:
     zowe_xmem_install_from_path: "{{ zowe_root_dir }}/scripts/utils"
 
 # ============================================================================
 # Run ZWESECUR
 - import_role:
-    name: configfmid
+    name: configptf
     tasks_from: create_security_defn
   when: not zowe_configure_skip_zwesecur
 
-# ============================================================================
-# Setup certificates
-- import_role:
-    name: configfmid
-    tasks_from: setup_certificates
-
 # ============================================================================
 # Configure Zowe Instance
 - import_role:
-    name: configfmid
+    name: configptf
     tasks_from: configure_instance

playbooks/roles/configure/README.md

@@ -2,4 +2,6 @@
 
 This role will configure Zowe after Zowe runtime has been laid down on the server.
 
-Please note: if you want to configure FMID, should use `configfmid` role.
+Please note: if you want to configure SMP/e install, should use `configptf` role.
+
+Please note: config no longers works for base FMID on z/OS 2.5+

playbooks/roles/ptf/tasks/is_ptf_installed.yml

@@ -53,6 +53,10 @@
     file_upload_method: scp
     file_upload_hashcheck: false
 
+- name: Convert ascii to ebcdic
+  when: convert_upload|default(False)
+  raw: iconv -f ISO8859-1 -t IBM-1047 "{{ work_dir_remote }}/LSTFMID.jcl" > "{{ work_dir_remote }}/LSTFMID.jcl.ebcdic" && mv  "{{ work_dir_remote }}/LSTFMID.jcl.ebcdic"  "{{ work_dir_remote }}/LSTFMID.jcl"
+
 # ============================================================================
 # Run LSTFMID.jcl
 - name: Run LSTFMID.jcl

playbooks/roles/ptf/tasks/main.yml

@@ -64,6 +64,17 @@
     file_upload_hashcheck: false
   loop: "{{ zowe_ptf_install_jcls }}"
 
+# ============================================================================
+# Convert uploaded JCLs in remote workspace if necessary
+- name: (Optional) convert PTF installation JCLs
+  vars:
+    filename: "{{ item }}.jcl"
+  loop: "{{ zowe_ptf_install_jcls }}"
+  when: convert_upload|default(False)
+  raw: iconv -f ISO8859-1 -t IBM-1047 "{{ work_dir_remote }}/{{ filename }}" > "{{ work_dir_remote }}/{{ filename }}.ebcdic" && mv  "{{ work_dir_remote }}/{{ filename }}.ebcdic"  "{{ work_dir_remote }}/{{ filename }}"
+
+
+
 - name: Fix JCLs is we only have 1 PTF
   when: zowe_smpe_ptf_2 == ""
   block:
@@ -129,12 +140,12 @@
     mode: 0700
   delegate_to: localhost
 
-- import_role:
-    name: zos
-    tasks_from: upload_and_run_script
-  vars:
-    upload_and_run_script_filename: install-SMPE-SYSMOD.sh
-    upload_and_run_script_parameters: "\"{{ zowe_smpe_hlq_dsn }}\" \"{{ zowe_smpe_hlq_csi }}\" \"{{ (zowe_smpe_dir_prefix is regex(\"/$\")) | ternary(zowe_smpe_dir_prefix, zowe_smpe_dir_prefix + \"/\") }}\" \"{{ work_dir_remote }}\" \"{{ zowe_smpe_fmid }}\" \"{{ zowe_smpe_ptf }}\" \"{{ zowe_smpe_ptf_2 }}\" \"{{ zowe_smpe_volser }}\" install"
+#- import_role:
+#    name: zos
+#    tasks_from: upload_and_run_script
+#  vars:
+#    upload_and_run_script_filename: install-SMPE-SYSMOD.sh
+#    upload_and_run_script_parameters: "\"{{ zowe_smpe_hlq_dsn }}\" \"{{ zowe_smpe_hlq_csi }}\" \"{{ (zowe_smpe_dir_prefix is regex(\"/$\")) | ternary(zowe_smpe_dir_prefix, zowe_smpe_dir_prefix + \"/\") }}\" \"{{ work_dir_remote }}\" \"{{ zowe_smpe_fmid }}\" \"{{ zowe_smpe_ptf }}\" \"{{ zowe_smpe_ptf_2 }}\" \"{{ zowe_smpe_volser }}\" install"
 
 - name: Check if the first PTF is installed properly
   block:

playbooks/roles/zos/tasks/upload_and_run_script.yml

@@ -13,6 +13,11 @@
     file_upload_method: scp
     file_upload_hashcheck: false
 
+# Necessary for some scp distros, as on MacOS
+- name: Convert ascii to ebcdic
+  when: convert_upload|default(False)
+  raw: iconv -f ISO8859-1 -t IBM-1047 "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}" > "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}.ebcdic" && mv  "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}.ebcdic"  "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}"
+
 - name: Add executive permission to {{ upload_and_run_script_filename }}
   raw: chmod a+x "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}"
 

tests/installation/src/utils.ts

@@ -49,7 +49,7 @@
  *
  * @param {Any} obj        any object
  */
 export function calculateHash(obj: any): string {
   return crypto.createHash('md5').update(util.format('%j', obj)).digest('hex');
 }
 
@@ -381,7 +381,9 @@
     'install-fmid.yml',
     serverId,
     {
-      'zowe_build_remote': ZOWE_FMID
+      'zowe_build_remote': ZOWE_FMID,
+      'skip_configfmid': 'true',
+      'skip_start': 'true'
     }
   );