PTF Build Failure (part 2)

playbooks/README.md

@@ -261,6 +261,7 @@ $ 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`.

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,15 +78,3 @@
   - import_role:
       name: fmid
       tasks_from: overwrite_vars
-
-  # ============================================================================
-  # Configure Zowe
-  - import_role:
-      name: configfmid
-    when: not skip_configfmid|default(False)
-
-  # ============================================================================
-  # 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/configure_instance.yml → playbooks/roles/configptf/tasks/configure_instance.yml

@@ -1,5 +1,9 @@
 ---
 # this playbook call bin/zowe-configure-instance.sh to create instance
+
+- name: Dump env (debug)
+  raw: env
+
 - name: Create Zowe instance
   import_role:
     name: zos

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/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 }}"