[ISV-1907] Operator release pipeline no longer pushes images into OSD registry (#360)

* [ISV-1907] Operator release pipeline no longer pushes images into OSD registry

* Update dest_image path for copy_image skopeo inspect

Author: wcheang

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-release-pipeline.yml

@@ -315,6 +315,8 @@ spec:
       taskRef:
         name: copy-image
       params:
+        - name: pipeline_image
+          value: "$(params.pipeline_image)"
         - name: src_image
           value: *srcBundleImage
         - name: is_latest
@@ -323,6 +325,8 @@ spec:
           value: "$(params.dest_registry)/$(params.dest_image_namespace)/$(tasks.certification-project-check.results.certification_project_id)"
         - name: dest_image_tag
           value: "$(tasks.bundle-path-validation.results.bundle_version)"
+        - name: connect_repo_path
+          value: "$(tasks.set-env.results.connect_registry)/$(tasks.get-vendor-related-data.results.vendor_label)/$(tasks.get-cert-project-related-data.results.repo_name)"
       workspaces:
         - name: src-registry-credentials
           workspace: registry-pull-credentials
@@ -357,37 +361,10 @@ spec:
         - name: registry-credentials
           workspace: registry-serve-credentials
 
-    # Publish image to OCP registry
-    - name: publish-to-ocp-registry
-      runAfter:
-        - get-vendor-related-data
-      taskRef:
-        name: publish-to-ocp-registry
-      params:
-        - name: cert_project_id
-          value: "$(tasks.certification-project-check.results.certification_project_id)"
-        - name: vendor_label
-          value: "$(tasks.get-vendor-related-data.results.vendor_label)"
-        - name: repository_name
-          value: "$(tasks.get-cert-project-related-data.results.repo_name)"
-        - name: image
-          value: *srcBundleImage
-        - name: is_latest
-          value: "$(params.is_latest)"
-        - name: bundle_version
-          value: "$(tasks.bundle-path-validation.results.bundle_version)"
-        - name: connect_registry
-          value: "$(tasks.set-env.results.connect_registry)"
-        - name: ocp_registry_kubeconfig_secret_name
-          value: "$(params.ocp_registry_kubeconfig_secret_name)"
-        - name: ocp_registry_kubeconfig_secret_key
-          value: "$(params.ocp_registry_kubeconfig_secret_key)"
-
     # create container image
     - name: create-container-image
       runAfter:
         - set-cert-project-repository
-        - publish-to-ocp-registry
         - inspect-image
       taskRef:
         name: create-container-image
@@ -401,7 +378,7 @@ spec:
         - name: repository
           value: "$(tasks.get-vendor-related-data.results.vendor_label)/$(tasks.get-cert-project-related-data.results.repo_name)"
         - name: container_digest
-          value: "$(tasks.publish-to-ocp-registry.results.container_digest)"
+          value: "$(tasks.copy-bundle-image-to-released-registry.results.container_digest)"
         - name: pyxis_url
           value: "$(tasks.set-env.results.pyxis_url)"
         - name: pyxis_ssl_secret_name
@@ -460,7 +437,7 @@ spec:
         - name: index_images
           value: "$(tasks.get-supported-versions.results.indices)"
         - name: bundle_pullspec
-          value: "$(tasks.publish-to-ocp-registry.results.image_pullspec)"
+          value: "$(tasks.copy-bundle-image-to-released-registry.results.image_pullspec)"
         - name: iib_url
           value: "$(tasks.set-env.results.iib_url)"
         - name: environment

ansible/roles/operator-pipeline/templates/openshift/tasks/copy-image.yml

@@ -5,9 +5,9 @@ metadata:
   name: copy-image
 spec:
   params:
-    - name: skopeo_image
-      description: Skopeo image
-      default: "registry.redhat.io/rhel8/skopeo:8.4-13"
+    - name: pipeline_image
+    - name: connect_repo_path
+      description: Combined path of the repo on the Connect registry
     - name: src_image
       description: reference to the source bundle image
     - name: dest_image_registry_namespace_certproject
@@ -21,23 +21,33 @@ spec:
       description: Docker config for the source registry
     - name: dest-registry-credentials
       description: Docker config for the destination registry
+  results:
+    - name: container_digest
+    - name: image_pullspec
   steps:
     - name: skopeo-copy
-      image: "$(params.skopeo_image)"
+      image: "$(params.pipeline_image)"
       script: |
         set -xe
 
+        SRC_AUTHFILE=$(workspaces.src-registry-credentials.path)/.dockerconfigjson
+        DEST_AUTHFILE=$(workspaces.dest-registry-credentials.path)/.dockerconfigjson
+
         skopeo copy \
-          --src-authfile $(workspaces.src-registry-credentials.path)/.dockerconfigjson \
-          --dest-authfile $(workspaces.dest-registry-credentials.path)/.dockerconfigjson \
+          --src-authfile $SRC_AUTHFILE \
+          --dest-authfile $DEST_AUTHFILE \
           docker://$(params.src_image) \
           docker://"$(params.dest_image_registry_namespace_certproject):$(params.dest_image_tag)"
 
         # optionally tag destination image as latest
         if [ "$(params.is_latest)" = "true" ]; then
           skopeo copy \
-            --src-authfile $(workspaces.src-registry-credentials.path)/.dockerconfigjson \
-            --dest-authfile $(workspaces.dest-registry-credentials.path)/.dockerconfigjson \
+            --src-authfile $SRC_AUTHFILE \
+            --dest-authfile $DEST_AUTHFILE \
             docker://$(params.src_image) \
             docker://"$(params.dest_image_registry_namespace_certproject):latest"
         fi
+
+        DIGEST=$(skopeo inspect --authfile $DEST_AUTHFILE docker://$(params.dest_image_registry_namespace_certproject):$(params.dest_image_tag) | jq -r .Digest)
+        echo -n $DIGEST | tee $(results.container_digest.path)
+        echo -n "$(params.connect_repo_path)@${DIGEST}" > $(results.image_pullspec.path)