mirror_ocp_release: fixes for concurrent jobs

Author: nsilla

roles/mirror_ocp_release/tasks/artifacts.yml

@@ -7,38 +7,52 @@
   when:
     - not mor_force
 
+- name: Create temporary working directory
+  ansible.builtin.tempfile:
+    state: directory
+    prefix: mor-
+  register: _mor_tmp
+  notify: "Remove temporary directory"
+  when: mor_force or not _mor_target.stat.exists
+
 - name: "Extract the OCP installer and metadata"
   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 installer 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: _mor_extract_res.rc == 0
+
+    - name: "Extract metadata 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
       until: _mor_extract_res is not failed
-      changed_when: false
+      changed_when: _mor_extract_res.rc == 0
 
     - 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";
-        }'
+        "{{ _mor_tmp.path }}/{{ mor_installer }}" coreos print-stream-json >
+        "{{ _mor_tmp.path }}/rhcos.json"
+      args:
+        creates: "{{ _mor_tmp.path }}/rhcos.json"
 
     - name: "Download rhcos.json (< 4.8)"
       when:
@@ -47,7 +61,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 +71,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
@@ -66,8 +80,8 @@
       changed_when: false
 
     - name: Apply SELinux container file context to extracted files
-      ansible.builtin.sefcontext:
-        target: "{{ mor_cache_dir }}/{{ mor_version }}"
+      community.general.sefcontext:
+        target: "{{ _mor_tmp.path }}"
         setype: container_file_t
       become: true
       register: _mor_cache_secontext
@@ -79,7 +93,7 @@
 
     - name: "Make installer command readable from HTTP"
       ansible.builtin.file:
-        path: "{{ mor_cache_dir }}/{{ mor_version }}/{{ mor_installer }}"
+        path: "{{ _mor_tmp.path }}/{{ mor_installer }}"
         state: file
         owner: "{{ mor_owner }}"
         group: "{{ mor_group }}"
@@ -90,9 +104,14 @@
       delay: 5
       until: _mor_install_mode is not failed
 
+    - name: Copy artifacts to release directory
+      ansible.builtin.copy:
+        src: "{{ _mor_tmp.path }}/"
+        dest: "{{ mor_cache_dir }}/{{ mor_version }}/"
+        mode: preserve
   always:
-    - name: "Ensure lock file is removed"
+    - name: Remove temporary directory
       ansible.builtin.file:
-        path: "{{ mor_cache_dir }}/{{ mor_version }}/release_extract.lock"
+        path: "{{ _mor_tmp.path }}"
         state: absent
 ...

roles/mirror_ocp_release/tasks/facts.yml

@@ -13,19 +13,23 @@
     mor_release_image: "{{ _mor_release_content.content | b64decode | regex_search('(?<=^Pull From: )(.*)$', multiline=true) }}"
 
 - name: "Read the contents of rhcos.json"
-  ansible.builtin.command: "cat {{ mor_cache_dir }}/{{ mor_version }}/rhcos.json"
-  register: rhcos
+  ansible.builtin.slurp:
+    src: "{{ mor_cache_dir }}/{{ mor_version }}/rhcos.json"
+  register: _mor_rhcos
   no_log: true
   retries: 6
   delay: 10
-  until: rhcos is not failed
+  until: _mor_rhcos is not failed
 
 - name: "Set image facts"
   ansible.builtin.set_fact:
-    ocp_release_data:
+    mor_ocp_release_data:
       container_image: "{{ mor_release_image }}"
-      rhcos_version: "{{ rhcos.stdout | from_json | json_query('architectures.x86_64.artifacts.metal.release') }}"
-      rhcos_images: "{{ ocp_release_data['rhcos_images'] | default({}) | combine({item.key: (rhcos.stdout | from_json | json_query('architectures.x86_64.artifacts.' + item.path))}) }}"
+      rhcos_version: "{{ rhcos_json | json_query('architectures.x86_64.artifacts.metal.release') }}"
+      rhcos_images: "{{ mor_ocp_release_data['rhcos_images'] | default({}) | combine({item.key: (rhcos_json | json_query(arch_query))}) }}"
+  vars:
+    rhcos_json: "{{ _mor_rhcos.content | b64decode | from_json }}"
+    arch_query: "architectures.x86_64.artifacts.{{ item.path }}"
   with_items:
     - {'key': 'aws_location', 'path': 'aws.formats."vmdk.gz".disk.location'}
     - {'key': 'aws_sha256', 'path': 'aws.formats."vmdk.gz".disk.sha256'}
@@ -60,13 +64,15 @@
 # TODO: Remove this task when 4.7 is no longer supported
 - name: "Set image facts (< 4.8)"
   vars:
-    rhcos_ver: "{{ rhcos.stdout | from_json | json_query('buildid') }}"
+    rhcos_json: "{{ _mor_rhcos.content | b64decode | from_json }}"
+    rhcos_ver: "{{ rhcos_json | json_query('buildid') }}"
     base_uri: "https://rhcos.mirror.openshift.com/art/storage/releases/rhcos-{{ mor_base_version }}/{{ rhcos_ver }}/x86_64/"
+    add_item: "{{ {item.key: (item.baseURI | default('')) + (rhcos_json | json_query('images.' + item.path))} }}"
   ansible.builtin.set_fact:
-    ocp_release_data:
+    mor_ocp_release_data:
       container_image: "{{ mor_release_image }}"
       rhcos_version: "{{ rhcos_ver }}"
-      rhcos_images: "{{ ocp_release_data['rhcos_images'] | default({}) | combine({item.key: (item.baseURI | default('')) + (rhcos.stdout | from_json | json_query('images.' + item.path))}) }}"
+      rhcos_images: "{{ mor_ocp_release_data['rhcos_images'] | default({}) | combine(add_item) }}"
   with_items:
     - {'key': 'aws_location', 'baseURI': "{{ base_uri }}", 'path': 'aws.path'}
     - {'key': 'aws_sha256', 'path': 'aws.sha256'}
@@ -103,9 +109,11 @@
 # TODO: remove for releases >= 4.8
 - name: "Set facts for *osimage URL overrides"
   ansible.builtin.set_fact:
-    bootstraposimage: "{{ mor_webserver_url }}/{{ ocp_release_data['rhcos_images']['qemu_location'] | basename }}?sha256={{ ocp_release_data['rhcos_images']['qemu_uncompressed_sha256'] }}"
-    clusterosimage: "{{ mor_webserver_url }}/{{ ocp_release_data['rhcos_images']['openstack_location'] | basename }}?sha256={{ ocp_release_data['rhcos_images']['openstack_sha256'] }}"
-    metalosimage: "{{ mor_webserver_url }}/{{ ocp_release_data['rhcos_images']['metal_iso_location'] | basename }}?sha256={{ ocp_release_data['rhcos_images']['metal_iso_sha256'] }}"
+    bootstraposimage: "{{ mor_webserver_url }}/{{ rhcos_images['qemu_location'] | basename }}?sha256={{ rhcos_images['qemu_uncompressed_sha256'] }}"
+    clusterosimage: "{{ mor_webserver_url }}/{{ rhcos_images['openstack_location'] | basename }}?sha256={{ rhcos_images['openstack_sha256'] }}"
+    metalosimage: "{{ mor_webserver_url }}/{{ rhcos_images['metal_iso_location'] | basename }}?sha256={{ rhcos_images['metal_iso_sha256'] }}"
+  vars:
+    rhcos_images: "{{ mor_ocp_release_data['rhcos_images'] }}"
   when:
     - mor_write_custom_config | bool
 ...

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 }}"
@@ -20,8 +12,8 @@
   become: true
   retries: 3
   delay: 10
-  register: downloaded
-  until: downloaded is not failed
+  register: _mor_downloaded
+  until: _mor_downloaded is not failed
   when:
     - mor_force or not target.stat.exists
 
@@ -35,4 +27,6 @@
   ansible.builtin.command: /usr/sbin/restorecon -R "{{ mor_dir }}/{{ mor_uri | basename }}"
   become: true
   when: _mor_selinux.rc == 0
+  register: _mor_restorecon
+  changed_when: _mor_restorecon.rc == 0
 ...

roles/mirror_ocp_release/tasks/files.yml

@@ -13,6 +13,6 @@
   become: true
   retries: 10
   delay: 20
-  register: downloaded
-  until: downloaded is not failed
+  register: _mor_downloaded
+  until: _mor_downloaded is not failed
 ...

roles/mirror_ocp_release/tasks/images.yml

@@ -2,8 +2,8 @@
 - name: "Mirror Disk Images for the install type"
   ansible.builtin.include_tasks: fetch.yml
   vars:
-    mor_uri: "{{ ocp_release_data['rhcos_images'][item + '_location'] }}"
-    mor_checksum: "sha256:{{ ocp_release_data['rhcos_images'][item + '_sha256'] }}"
+    mor_uri: "{{ mor_ocp_release_data['rhcos_images'][item + '_location'] }}"
+    mor_checksum: "sha256:{{ mor_ocp_release_data['rhcos_images'][item + '_sha256'] }}"
     mor_dir: "{{ mor_cache_dir }}"
   loop: "{{ mor_images }}"
 ...

roles/mirror_ocp_release/tasks/main.yml

@@ -12,15 +12,15 @@
   ansible.builtin.stat:
     path: "{{ mor_auths_file }}"
     get_checksum: false
-  register: mor_auths_file_check
+  register: _mor_auths_file_check
   when:
     - mor_auths_file is defined
 
 - name: "Validate optional authentication file"
   ansible.builtin.assert:
     that:
       - mor_auths_file is defined
-      - mor_auths_file_check.stat.exists | bool
+      - _mor_auths_file_check.stat.exists | bool
   when:
     - mor_mirror_container_images | bool
 

roles/mirror_ocp_release/tasks/registry.yml

@@ -3,25 +3,22 @@
   ansible.builtin.command: >
     skopeo inspect
     --no-tags
-    --authfile {{ mor_auths_file }}
-    {%- if mor_allow_insecure_registry | bool %}
-    --tls-verify=false
-    {%- endif %}
+    --authfile {{ mor_auths_file }}{%- if mor_allow_insecure_registry | bool %}
+    --tls-verify=false{%- endif %}
     docker://{{ mor_registry_url }}/{{ mor_registry_path }}:{{ mor_version }}
   register: _mor_release_image
+  changed_when: _mor_release_image.rc == 0
   failed_when: false
   when: not mor_force | bool
 
 - name: Mirror release images to local registry
   ansible.builtin.command: >-
     {{ mor_oc }} adm release mirror
     --registry-config={{ mor_auths_file }}
-    --from={{ ocp_release_data['container_image'] | quote }}
+    --from={{ mor_ocp_release_data['container_image'] | quote }}
     --to-release-image={{ mor_registry_url }}/{{ mor_registry_path }}:{{ mor_version }}
-    --to={{ mor_registry_url }}/{{ mor_registry_path }}
-    {%- if mor_allow_insecure_registry | bool %}
-    --insecure
-    {%- endif %}
+    --to={{ mor_registry_url }}/{{ mor_registry_path }}{%- if mor_allow_insecure_registry | bool %}
+    --insecure{%- endif %}
   retries: 3
   delay: 10
   register: _mor_result
@@ -37,13 +34,13 @@
   ansible.builtin.command: >-
     {{ mor_oc }} adm release mirror
     --registry-config={{ mor_auths_file }}
-    --from={{ ocp_release_data['container_image'] | quote }}
+    --from={{ mor_ocp_release_data['container_image'] | quote }}
     --to-release-image={{ mor_registry_url }}/{{ mor_registry_path }}:{{ mor_version }}
     --to={{ mor_registry_url }}/{{ mor_registry_path }}
-    {{ mor_version is version("4.14", "<") | ternary("--dry-run", "--print-mirror-instructions=" + mor_is_type | lower ) }}
-    {%- if mor_allow_insecure_registry | bool %}
-    --insecure
-    {%- endif %}
+    {{ mor_version is version("4.14", "<") | ternary("--dry-run", mirror_instructions) }}{%- if mor_allow_insecure_registry | bool %}
+    --insecure{%- endif %}
+  vars:
+    mirror_instructions: "--print-mirror-instructions= {{ mor_is_type | lower }}"
   retries: 3
   delay: 10
   register: _mor_result