[release-v1.15] Add arm builds (#436)

* Add arm builds

* Add arm builds on linux also

---------

Co-authored-by: David Simansky <dsimansk@redhat.com>

openshift/ci-operator/knative-images/client/Dockerfile.cliartifacts

@@ -7,11 +7,13 @@ RUN microdnf install -y zip tar gzip && \
 
 FROM registry.ci.openshift.org/ocp/ubi-minimal:8
 WORKDIR /opt/app-root/src/go/src/github.com/knative/client
-RUN mkdir -p /usr/share/kn/{linux_amd64,linux_arm64,linux_ppc64le,linux_s390x,macos,windows}
+RUN mkdir -p /usr/share/kn/{linux_amd64,linux_arm64,linux_ppc64le,linux_s390x,macos_amd64,macos_arm64,windows}
 
 COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/kn-linux-amd64.tar.gz /usr/share/kn/linux_amd64/
+COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/kn-linux-arm64.tar.gz /usr/share/kn/linux_arm64/
 COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/kn-linux-ppc64le.tar.gz /usr/share/kn/linux_ppc64le/
 COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/kn-linux-s390x.tar.gz /usr/share/kn/linux_s390x/
-COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/kn-macos-amd64.tar.gz /usr/share/kn/macos/
+COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/kn-macos-amd64.tar.gz /usr/share/kn/macos_amd64/
+COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/kn-macos-arm64.tar.gz /usr/share/kn/macos_arm64/
 COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/kn-windows-amd64.zip  /usr/share/kn/windows/
 COPY --from=packager /opt/app-root/src/go/src/github.com/knative/client/LICENSE  /usr/share/kn/LICENSE

openshift/e2e-common.sh

@@ -31,7 +31,7 @@ readonly SERVING_BRANCH="release-next"
 readonly EVENTING_BRANCH="release-next"
 
 # The value should be updated once S-O release branch is cut
-readonly SERVERLESS_BRANCH="main"
+readonly SERVERLESS_BRANCH="serverless-1.33"
 
 # Determine if we're running locally or in CI.
 if [ -n "$OPENSHIFT_BUILD_NAMESPACE" ]; then

package_cliartifacts.sh

@@ -29,6 +29,12 @@ pkg_tar() {
     	mv kn-darwin-amd64 ${OUTDIR}/${dir}/kn
       chmod +x ${OUTDIR}/${dir}/kn
       ;;
+    macos-arm64)
+      dir=macos-arm64
+      mkdir "${OUTDIR}/${dir}"
+      mv kn-darwin-arm64 ${OUTDIR}/${dir}/kn
+      chmod +x ${OUTDIR}/${dir}/kn
+      ;;
   esac
   cp LICENSE ${OUTDIR}/${dir}
   tar -zcf kn-${dir}.tar.gz -C ${OUTDIR}/${dir} .
@@ -49,4 +55,5 @@ pkg_tar arm64
 pkg_tar ppc64le
 pkg_tar s390x
 pkg_tar macos
+pkg_tar macos-arm64
 pkg_zip_for_windows