mirror_ocp_release: fixes for concurrent jobs

Author: nsilla

roles/mirror_ocp_release/handlers/main.yml

@@ -0,0 +1,4 @@
+- name: Remove temporary directory
+  ansible.builtin.file:
+    path: "{{ _mor_tmp.path }}"
+    state: absent

roles/mirror_ocp_release/tasks/artifacts.yml

@@ -11,20 +11,26 @@
   when:
     - mor_force or not _mor_target.stat.exists
   block:
-    - name: "Extract installer and metadata from release image"
-      ansible.builtin.shell: >
-        flock -x {{ mor_cache_dir }}/{{ mor_version }}/release_extract.lock -c '
-        set -e;
+    - name: "Extract metadata from release image"
+      ansible.builtin.command: >
         {{ mor_oc }} adm release extract
         --registry-config {{ mor_auths_file }}
         --command={{ mor_installer }}
         --from {{ mor_pull_url }}
-        --to "{{ mor_cache_dir }}/{{ mor_version }}";
+        --to "{{ _mor_tmp.path }}";
+      register: _mor_extract_res
+      retries: 9
+      delay: 10
+      until: _mor_extract_res is not failed
+      changed_when: false
+
+    - name: "Extract installer from release image"
+      ansible.builtin.command: >
         {{ mor_oc }} adm release extract
         --registry-config {{ mor_auths_file }}
         --tools
         --from {{ mor_pull_url }}
-        --to "{{ mor_cache_dir }}/{{ mor_version }}"'
+        --to "{{ _mor_tmp.path }}"
       register: _mor_extract_res
       retries: 9
       delay: 10
@@ -34,11 +40,9 @@
     - name: "Extract rhcos.json if version >= 4.8"
       when:
         - mor_version is version("4.8", ">=")
-      ansible.builtin.shell: >
-        flock -x "{{ mor_cache_dir }}/{{ mor_version }}/release_extract.lock" -c '{
-        "{{ mor_cache_dir }}/{{ mor_version }}/{{ mor_installer }}" coreos print-stream-json >
-        "{{ mor_cache_dir }}/{{ mor_version }}/rhcos.json";
-        }'
+      ansible.builtin.command: >
+        "{{ _mor_tmp.path }}/{{ mor_installer }}" coreos print-stream-json >
+        "{{ _mor_tmp.path }}/rhcos.json";
 
     - name: "Download rhcos.json (< 4.8)"
       when:
@@ -47,7 +51,7 @@
         - name: "Get Git SHA from installer"
           ansible.builtin.shell: >
             set -e -o pipefail;
-            {{ mor_cache_dir }}/{{ mor_version }}/openshift-baremetal-install version |
+            {{ _mor_tmp.path }}/openshift-baremetal-install version |
             grep "^built from" |
             awk '{ print $NF }'
           register: _mor_commit_id
@@ -57,7 +61,7 @@
           ansible.builtin.include_tasks: fetch.yml
           vars:
             mor_uri: "https://raw.githubusercontent.com/openshift/installer/{{ _mor_commit_id.stdout }}/data/data/rhcos.json"
-            mor_dir: "{{ mor_cache_dir }}/{{ mor_version }}"
+            mor_dir: "{{ _mor_tmp.path }}"
 
     - name: "Figure out status of SELinux"
       ansible.builtin.command: /usr/sbin/selinuxenabled

roles/mirror_ocp_release/tasks/fetch.yml

@@ -1,12 +1,4 @@
 ---
-- name: "Check if target file exists"
-  ansible.builtin.stat:
-    path: "{{ mor_dir }}/{{ mor_uri | basename }}"
-    get_checksum: false
-  register: target
-  when:
-    - not mor_force
-
 - name: "Fetch file from URL"
   ansible.builtin.get_url:
     url: "{{ mor_uri }}"
@@ -24,15 +16,4 @@
   until: downloaded is not failed
   when:
     - mor_force or not target.stat.exists
-
-- name: "Figure out status of SELinux"
-  ansible.builtin.command: /usr/sbin/selinuxenabled
-  ignore_errors: true
-  register: _mor_selinux
-  changed_when: false
-
-- name: "Apply new SELinux file context to file"
-  ansible.builtin.command: /usr/sbin/restorecon -R "{{ mor_dir }}/{{ mor_uri | basename }}"
-  become: true
-  when: _mor_selinux.rc == 0
 ...

roles/mirror_ocp_release/tasks/main.yml

@@ -50,6 +50,13 @@
   ansible.builtin.debug:
     var: mor_version
 
+- name: Create temporary working directory
+  ansible.builtin.tempfile:
+    state: directory
+    prefix: mor-
+  register: _mor_tmp
+  notify: "Remove temporary directory"
+
 - name: "Set list of OS images to mirror"
   ansible.builtin.include_tasks: image-list.yml
   when:
@@ -78,4 +85,9 @@
   ansible.builtin.include_tasks: registry.yml
   when:
     - mor_mirror_container_images | bool
+
+- name: Copy artifacts to release directory
+  ansible.builtin.copy:
+    src: "{{ _mor_tmp.path }}/"
+    dest: "{{ mor_cache_dir }}/{{ mor_version }}"
 ...