MULTIARCH-3440: update the code to use go-containerregistry for all a…

…rches and add arm64

Signed-off-by: Paul Bastide <pbastide@redhat.com>

.goreleaser.yaml

@@ -13,6 +13,7 @@ builds:
       - amd64
       - ppc64le
       - s390x
+      - arm64
     env:
       - CGO_ENABLED=1
     flags:

test/e2e/lib/util.sh

@@ -55,33 +55,27 @@ function install_deps() {
     tar xvf opm.tar bin/opm
     mv bin/opm $GOBIN
     rm -f registry2.tar opm.tar
-      wget -O $GOBIN/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
-      chmod +x $GOBIN/jq
+    wget -O $GOBIN/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
+    chmod +x $GOBIN/jq
   else
+    # non x86_64 flow
     pushd ${DATA_TMP}
+
     # Creates a temp directory
     mkdir -p test/e2e/operator-test.deps
     cd test/e2e/operator-test.deps
 
     curl -o $GOBIN/opm -L https://github.com/operator-framework/operator-registry/releases/download/v1.26.5/linux-$(arch)-opm
     chmod +x $GOBIN/opm
 
-    # Serves a local registry
-    # When PR https://github.com/google/go-containerregistry/pull/1680
-    # is in a release the following few lines won't be necessary.
-    git clone https://github.com/google/go-containerregistry.git
-    cd go-containerregistry
-    git checkout $(git describe --tags) # latest tag
-    go build ./cmd/crane 
-    mv crane $GOBIN/
-
+    GOFLAGS=-mod=mod go install github.com/google/go-containerregistry/cmd/crane@latest
+    mv ${HOME}/go/bin/crane $GOBIN/
+
     crane export $(arch)/registry:2 registry2.tar
     tar xvf registry2.tar bin/registry
     cp bin/registry ../
     mv bin/registry $GOBIN
-
     cd ..
-    rm -rf go-containerregistry/
     popd
   fi
 }