Merge pull request #641 from IBM/case-save

#640 Download case files until /tmp/work
IBM · Feb 26, 2024 · a51a004 · a51a004
2 parents 73384be + 0404e0b
commit a51a004
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-case-save/tasks/main.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-case-save/tasks/main.yml
@@ -39,21 +39,21 @@
   with_items:
   - '(oc image mirror.*)'
   - '(oc ibm-pak generate.*)'
-  - '(mv /tmp/work.*)'
 
-- name: Download case files, logs are in {{ status_dir }}/cp4d/mirror-images-case-save-ibm-pak.log
+- name: Download case files, logs are in {{ status_dir }}/log/mirror-images-case-save-ibm-pak.log
   shell: |
+    HOME=/tmp/work/offline/{{ _p_current_cp4d_cluster.cp4d_version }} && \
     {{ status_dir }}/cp4d/mirror-images-case-save-ibm-pak.sh > {{ status_dir }}/log/mirror-images-case-save-ibm-pak.log
   args:
     chdir: /tmp/work
 
-- name: Create {{ status_dir }}/cp4d/offline/{{ _p_current_cp4d_cluster.cp4d_version }} directory
+- name: Create {{ status_dir }}/cp4d directory
   file:
-    path: "{{ status_dir }}/cp4d/offline/{{ _p_current_cp4d_cluster.cp4d_version }}"
+    path: "{{ status_dir }}/cp4d"
     state: directory
 
 - name: Copy case files to {{ status_dir }}/cp4d/offline/{{ _p_current_cp4d_cluster.cp4d_version }}
   copy:
-    src: "/opt/ansible/.ibm-pak"
-    dest: "{{ status_dir }}/cp4d/offline/{{ _p_current_cp4d_cluster.cp4d_version }}/"
+    src: "/tmp/work/offline"
+    dest: "{{ status_dir }}/cp4d/"
     remote_src: True
diff --git a/...s/50-install-cloud-pak/cp4d/cp4d-catalog-source/tasks/create-catalog-source-olm-utils.yml b/...s/50-install-cloud-pak/cp4d/cp4d-catalog-source/tasks/create-catalog-source-olm-utils.yml
@@ -96,6 +96,6 @@
 - name: If not air-gapped, copy case files from /tmp/work/offline to {{ status_dir }}/cp4d/offline
   copy:
     src: /tmp/work/offline
-    dest: "{{ status_dir }}/cp4d/offline"
+    dest: "{{ status_dir }}/cp4d/"
     remote_src: True
   when: not (cpd_airgap | default(False) | bool)