collector

Author: robbycochran

ansible/ci-build-builder.yml

@@ -29,34 +29,20 @@
         recursive: true
       when: arch == "s390x"
 
-    #- name: Create a remote ccache directory if it does not exist
-    #  ansible.builtin.file:
-    #    path: "{{ collector_root }}/{{ ccache_dir }}"
-    #    state: directory
-    #    mode: '0777'
-    #  when: arch == "s390x"
-
-    #- name: Create a controller ccache directory if it does not exist
-    #  delegate_to: localhost
-    #  ansible.builtin.file:
-    #    path: "{{ github_workspace }}/{{ ccache_dir }}"
-    #    state: directory
-    #  when: arch == "s390x"
-
-    - name: Check if remote ccache archive exists on controller
+    - name: Check if ccache archive exists
       delegate_to: localhost
       ansible.builtin.stat:
         path: "{{ github_workspace }}/{{ ccache_path }}"
       register: ccache_check
       when: arch == "s390x"
 
-    - name: Copy ccache from the controller to build VM
+    - name: Copy ccache to build
       ansible.builtin.copy:
         src: "{{ github_workspace }}/{{ ccache_path }}"
         dest: "{{ collector_root }}/{{ ccache_dir }}/"
       when: arch == "s390x" and ccache_check.stat.exists
 
-    - name: Inject docker cache manually
+    - name: Inject docker cache
       ansible.builtin.shell:
         cmd: ansible/scripts/inject_docker_cache.sh "{{ collector_root }}/{{ ccache_dir }}" "{{ container_ccache_dir }}"
         chdir: "{{ collector_root }}"
@@ -75,13 +61,20 @@
         chdir: "{{ collector_root }}"
       when: arch == "s390x"
 
-    - name: Copy ccache from build machine to controller
+    - name: Fetch ccache
       ansible.builtin.fetch:
         src: "{{ collector_root }}/{{ ccache_path }}"
         dest: "{{ github_workspace }}/{{ ccache_dir }}/"
         flat: yes
       when: arch == "s390x"
 
+    - name: Fetch build log
+      ansible.builtin.fetch:
+        src: "{{ collector_root }}/build_builder_image.log"
+        dest: "{{ github_workspace }}/"
+        flat: yes
+      when: arch == "s390x"
+
     - name: Retag collector builder image to arch specific
       community.docker.docker_image:
         name: "quay.io/stackrox-io/collector-builder:{{ ansible_env.COLLECTOR_BUILDER_TAG }}"

ansible/ci-build-collector.yml

@@ -27,33 +27,27 @@
         version: "{{ local_branch }}"
         refspec: "+{{ collector_git_ref | replace('refs/', '') }}:{{ local_branch }}"
         recursive: true
-      when: arch == "s390x"
-
-    - name: Create a ccache directory if it does not exist
-      ansible.builtin.file:
-        path: "{{ collector_root }}/{{ ccache_dir }}"
-        state: directory
+        depth: 1
       when: arch == "s390x"
 
     - name: Check if remote ccache archive exists on controller
+      delegate_to: localhost
       ansible.builtin.stat:
         path: "{{ github_workspace }}/{{ ccache_dir }}/{{ ccache_archive }}"
-      delegate_to: localhost
       register: ccache_check
       when: arch == "s390x"
 
     - name: Copy ccache from the controller to build VM
       ansible.builtin.copy:
         src: "{{ github_workspace }}/{{ ccache_dir }}/{{ ccache_archive }}"
-        dest: "{{ collector_root }}/{{ ccache_archive }}"
-        mode: preserve
-        remote_src: no
-      delegate_to: localhost
+        dest: "{{ collector_root }}/"
       when: arch == "s390x" and ccache_check.stat.exists
 
     - name: Extract ccache archive if found
-      ansible.builtin.shell:
-        cmd: tar -xzf "{{ collector_root }}/{{ ccache_archive }}" -C "{{ collector_root }}/{{ ccache_dir }}"
+      ansible.builtin.unarchive:
+        src: "{{ collector_root }}/{{ ccache_archive }}"
+        dest: "{{ collector_root }}/{{ ccache_dir }}"
+        remote_src: true
       when: arch == "s390x" and ccache_check.stat.exists
 
     - name: Run the builder image