From 0404e0b64ea17cea93d4f52596cc7b2c873ca7b3 Mon Sep 17 00:00:00 2001 From: Frank Ketelaars Date: Mon, 26 Feb 2024 06:25:12 +0000 Subject: [PATCH] #640 Download case files until /tmp/work --- .../cp4d/cp4d-case-save/tasks/main.yml | 12 ++++++------ .../tasks/create-catalog-source-olm-utils.yml | 2 +- 2 files changed, 7 insertions(+), 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 index 59616005f..dce25394d 100644 --- 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 \ No newline at end of file diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-catalog-source/tasks/create-catalog-source-olm-utils.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-catalog-source/tasks/create-catalog-source-olm-utils.yml index 9528dd4a5..89d3246e7 100644 --- a/automation-roles/50-install-cloud-pak/cp4d/cp4d-catalog-source/tasks/create-catalog-source-olm-utils.yml +++ b/automation-roles/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) \ No newline at end of file