Fix breaking yq install

Signed-off-by: Lucas Yoon <[email protected]>

Author: Lucas Yoon

.ci/Dockerfile

@@ -25,7 +25,7 @@ ARG TARGETARCH=amd64
 # Install yq and jq
 ENV YQ_VERSION=v4.44.1
 ENV JQ_VERSION=1.6
-RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -o /usr/local/bin/yq && mv ./yq_linux_${TARGETARCH} /usr/local/bin/yq && chmod +x /usr/local/bin/yq
+RUN curl -sL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -o /usr/local/bin/yq && chmod +x /usr/local/bin/yq
 RUN yum install -y jq-${JQ_VERSION}
 
 COPY . /registry

.ci/Dockerfile.offline

@@ -25,7 +25,7 @@ ARG TARGETARCH=amd64
 # Install yq and jq
 ENV YQ_VERSION=v4.44.1
 ENV JQ_VERSION=1.6
-RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -o /usr/local/bin/yq && mv ./yq_linux_${TARGETARCH} /usr/local/bin/yq && chmod +x /usr/local/bin/yq
+RUN curl -sL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -o /usr/local/bin/yq && chmod +x /usr/local/bin/yq
 RUN yum install -y jq-${JQ_VERSION}
 COPY . /registry
 

.ci/openshift_integration.sh

@@ -51,8 +51,8 @@ curl -sL https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift
 export GLOBALODOCONFIG=$(pwd)/preferences.yaml
 
 # Download & Install Ginkgo
-GINKGO_VERSION=${GINKGO_VERSION:-v2.13.0}
-go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION}
+GINKGO_VERSION="$(cd $BASE_DIR/tests/odov3 && go list -m -mod=readonly -json all | ${YQ_PATH} 'select(.Path == "github.com/onsi/ginkgo/v2") | .Version' -Mr -p=json)"
+go install -mod=readonly github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION}
 
 # Install the devfile registry
 oc process -f $BASE_DIR/.ci/deploy/devfile-registry.yaml -p DEVFILE_INDEX_IMAGE=$IMG -p IMAGE_TAG=$TAG -p REPLICAS=3 -p ANALYTICS_WRITE_KEY= | \

extraDevfileEntries.yaml

@@ -111,7 +111,7 @@ samples:
   - name: dotnet-basic
     displayName: Basic .NET
     description: MVC .NET 6.0 application
-    icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png
+    icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png
     tags:
       - .NET
     projectType: dotnet

stacks/dotnet50/devfile.yaml

@@ -3,7 +3,7 @@ metadata:
   name: dotnet50
   displayName: .NET 5.0
   description: .NET 5.0 application
-  icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png
+  icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png
   tags:
     - .NET
     - .NET 5.0

stacks/dotnet60/devfile.yaml

@@ -3,7 +3,7 @@ metadata:
   name: dotnet60
   displayName: .NET 6.0
   description: .NET 6.0 application
-  icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png
+  icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png
   tags:
     - .NET
     - .NET 6.0

stacks/dotnet80/devfile.yaml

@@ -3,7 +3,7 @@ metadata:
   name: dotnet80
   displayName: .NET 8.0
   description: .NET 8.0 application
-  icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png
+  icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png
   tags:
     - .NET
     - .NET 8.0

stacks/dotnetcore31/devfile.yaml

@@ -3,7 +3,7 @@ metadata:
   name: dotnetcore31
   displayName: .NET Core 3.1
   description: .NET Core 3.1 application
-  icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png
+  icon: https://raw.githubusercontent.com/dotnet/brand/main/logo/dotnet-logo.png
   tags:
     - .NET
     - .NET Core App 3.1