Merge pull request #490 from mbaldessari/iib-output

Improve IIB

Author: mbaldessari

ansible/roles/iib_ci/README.md

@@ -64,17 +64,6 @@ use that. Run `make iib` with the following environment variables set:
 * `INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:492329`
 * `KUBEADMINPASS="11111-22222-33333-44444"`
 
-### OCP 4.12 and previous versions
-
-Due to the lack of v2 manifest support on the internal registry, we use an external
-registry. Run `make iib` with the following environment variables set:
-
-* `INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:492329`
-* `REGISTRY=quay.io/rhn_support_mbaldess/iib`
-* `REGISTRY_TOKEN=<username>:<token>`
-
-*Note*: For the REGISTRY_TOKEN go to your quay repository, add a robot with "Write" permissions. The robot created will have a "username" and "password" fields. Set the REGISTRY_TOKEN environment variable to that value.
-
 ## Useful commands
 
 * List IIBs for an operator:

ansible/roles/iib_ci/defaults/main.yml

@@ -1,10 +1,6 @@
 rh_internal_registry: registry-proxy.engineering.redhat.com
 iib_image: "{{ lookup('env', 'INDEX_IMAGE') }}"
 
-external_registry: "{{ lookup('env', 'REGISTRY') }}"
-external_registry_token: "{{ lookup('env', 'REGISTRY_TOKEN') }}"
-external_registry_email: noemail@localhost
-
 kubeadminpass: "{{ lookup('env', 'KUBEADMINPASS') }}"
 
 internal_registry_ns: openshift-marketplace

ansible/roles/iib_ci/tasks/main.yml

@@ -21,15 +21,15 @@
 
 - name: Is OCP pre OCP 4.13? (aka registry supports v2 manifests)
   ansible.builtin.set_fact:
-    use_internal_registry: "{{ oc_version_raw.stdout is version('4.13', '>=') }}"
+    ocp_413: "{{ oc_version_raw.stdout is version('4.13', '>=') }}"
+
+- name: Fail if OCP < 4.13 as we do not support it for IIB testing any longer
+  ansible.builtin.fail:
+    msg: "OCP versions < 4.13 are not support for IIB loading"
+  when: not ocp_413
 
 - name: Set up internal registry (OCP >= 4.13)
   ansible.builtin.include_tasks: setup-internal-registry.yml
-  when: use_internal_registry
-
-- name: Set up external registry (OCP < 4.13)
-  ansible.builtin.include_tasks: setup-external-registry.yml
-  when: not use_internal_registry
 
 - name: Install new IIB in cluster
   ansible.builtin.include_tasks: install-iib-in-cluster.yml

ansible/roles/iib_ci/tasks/mirror-related-images.yml

@@ -33,13 +33,24 @@
     right=$(grep "{{ image }}" "{{ iib_local_folder }}/mapping.txt" | cut -f2 -d=)
     right_base=$(echo $right | sed -e 's/:.*$//' -e 's/@.*$//')
     right_log=$(echo "${right_base}@${left_sha}" | sed -e 's/\//-/g')
-    if skopeo inspect --authfile "{{ pull_secrets_tempfolder.path }}/.dockerconfigjson" --no-tags docker://"{{ image }}" &> /tmp/skopeo-"{{ image | regex_replace('/', '-') }}".log; then
+    left_out=$(skopeo inspect --authfile "{{ pull_secrets_tempfolder.path }}/.dockerconfigjson" --no-tags docker://"{{ image }}" 2>&1)
+    left_ret=$?
+    if [ $left_ret -eq 0 ]; then
       echo "{{ image }}"
-    elif skopeo inspect --authfile "{{ pull_secrets_tempfolder.path }}/.dockerconfigjson" --no-tags docker://"${right_base}@${left_sha}" &> "/tmp/skopeo-${right_log}.log"; then
-      echo "${right_base}@${left_sha}"
     else
-      echo "ERROR: both {{ image }} and echo ${right_base}@${left_sha} could not be found"
-      exit 1
+      echo "${left_out}" > /tmp/skopeo-"{{ image | regex_replace('/', '-') }}".log
+      right_out=$(skopeo inspect --authfile "{{ pull_secrets_tempfolder.path }}/.dockerconfigjson" --no-tags docker://"${right_base}@${left_sha}" 2>&1)
+      right_ret=$?
+      if [ $right_ret -eq 0 ]; then
+        echo "${right_base}@${left_sha}"
+      else # both left_ret and right_ret were != 0
+        echo "${right_out}" > "/tmp/skopeo-${right_log}.log"
+        echo "ERROR: both {{ image }} and echo ${right_base}@${left_sha} could not be found"
+        echo "Printing both outputs:"
+        echo "Left out: ${left_out}"
+        echo "Right out: ${right_out}"
+        exit 1
+      fi
     fi
   register: all_existing_images
   with_items: "{{ all_images }}"
@@ -91,16 +102,6 @@
        'mirrordest_nosha': (mirror_dest + item | basename) | regex_replace('@.*$', ''),
        'mirrordest_tag': 'tag-' + item | basename | regex_replace('^.*@sha256:', '')}}, recursive=true) }}"
   loop: "{{ all_images }}"
-  when: use_internal_registry
-
-- name: Create dict with full image name+sha -> mirror destination (OCP < 4.13)
-  ansible.builtin.set_fact:
-    image_urls: "{{ image_urls | default({}) | combine({item:
-      {'mirrordest': mirror_dest + '@' + item | basename | regex_replace('^.*@', ''),
-       'mirrordest_nosha': mirror_dest,
-       'mirrordest_tag': 'tag-' + item | basename | regex_replace('^.*@sha256:', '')}}, recursive=true) }}"
-  loop: "{{ all_images }}"
-  when: not use_internal_registry
 
 - name: Create dict with full image name+sha -> image key without sha
   ansible.builtin.set_fact:
@@ -124,14 +125,6 @@
     src: ./templates/imageDigestMirror.yaml.j2
     dest: "{{ iib_local_folder }}/imageMirror.yaml"
     mode: "0644"
-  when: use_internal_registry
-
-- name: Template out imageMirror.yaml (OCP < 4.13)
-  ansible.builtin.template:
-    src: ./templates/imageContentSourcePolicy.yaml.j2
-    dest: "{{ iib_local_folder }}/imageMirror.yaml"
-    mode: "0644"
-  when: not use_internal_registry
 
 - name: Template out mirror.map
   ansible.builtin.template: