skip arm build in Prow e2e test

GoogleCloudPlatform · Sep 20, 2023 · 3898265 · 3898265
1 parent 52cbf96
commit 3898265
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -17,6 +17,7 @@ export REGISTRY ?= jiaxun
 export STAGINGVERSION ?= $(shell git describe --long --tags --match='v*' --dirty 2>/dev/null || git rev-list -n1 HEAD)
 export OVERLAY ?= stable
 export BUILD_GCSFUSE_FROM_SOURCE ?= false
+export BUILD_ARM ?= false
 BINDIR ?= $(shell pwd)/bin
 GCSFUSE_PATH ?= $(shell cat cmd/sidecar_mounter/gcsfuse_binary)
 LDFLAGS ?= -s -w -X main.version=${STAGINGVERSION} -extldflags '-static'
@@ -78,7 +79,8 @@ ifeq (${BUILD_GCSFUSE_FROM_SOURCE}, true)
 		-v ${BINDIR}/linux/amd64:/release \
 		gcsfuse-release:${GCSFUSE_VERSION}-amd \
 		cp /gcsfuse_${GCSFUSE_VERSION}_amd64/usr/bin/gcsfuse /release
-
+
+ifeq (${BUILD_ARM}, true)
 	docker buildx build \
 		--load \
 		--file ${BINDIR}/Dockerfile.gcsfuse \
@@ -93,16 +95,20 @@ ifeq (${BUILD_GCSFUSE_FROM_SOURCE}, true)
 		-v ${BINDIR}/linux/arm64:/release \
 		gcsfuse-release:${GCSFUSE_VERSION}-arm \
 		cp /gcsfuse_${GCSFUSE_VERSION}_arm64/usr/bin/gcsfuse /release
+endif
+
 else
 	gsutil cp ${GCSFUSE_PATH}/linux/amd64/gcsfuse ${BINDIR}/linux/amd64/gcsfuse
 	gsutil cp ${GCSFUSE_PATH}/linux/arm64/gcsfuse ${BINDIR}/linux/arm64/gcsfuse
 endif
 
 	chmod +x ${BINDIR}/linux/amd64/gcsfuse
-	chmod +x ${BINDIR}/linux/arm64/gcsfuse
-
 	chmod 0555 ${BINDIR}/linux/amd64/gcsfuse
+
+ifeq (${BUILD_ARM}, true)
+	chmod +x ${BINDIR}/linux/arm64/gcsfuse
 	chmod 0555 ${BINDIR}/linux/arm64/gcsfuse
+endif
 
 	${BINDIR}/linux/$(shell dpkg --print-architecture)/gcsfuse --version
 
@@ -115,14 +121,20 @@ init-buildx:
 	# Required for "docker buildx build --push".
 	gcloud auth configure-docker --quiet
 
-build-image-and-push-multi-arch: init-buildx download-gcsfuse build-image-linux-amd64 build-image-linux-arm64
+build-image-and-push-multi-arch: init-buildx download-gcsfuse build-image-linux-amd64
+ifeq (${BUILD_ARM}, true)
+	make build-image-linux-arm64
 	docker manifest create ${DRIVER_IMAGE}:${STAGINGVERSION} ${DRIVER_IMAGE}:${STAGINGVERSION}_linux_amd64 ${DRIVER_IMAGE}:${STAGINGVERSION}_linux_arm64
-	docker manifest push --purge ${DRIVER_IMAGE}:${STAGINGVERSION}
-
 	docker manifest create ${SIDECAR_IMAGE}:${STAGINGVERSION} ${SIDECAR_IMAGE}:${STAGINGVERSION}_linux_amd64 ${SIDECAR_IMAGE}:${STAGINGVERSION}_linux_arm64
-	docker manifest push --purge ${SIDECAR_IMAGE}:${STAGINGVERSION}
+else
+	docker manifest create ${DRIVER_IMAGE}:${STAGINGVERSION} ${DRIVER_IMAGE}:${STAGINGVERSION}_linux_amd64
+	docker manifest create ${SIDECAR_IMAGE}:${STAGINGVERSION} ${SIDECAR_IMAGE}:${STAGINGVERSION}_linux_amd64
+endif
 
 	docker manifest create ${WEBHOOK_IMAGE}:${STAGINGVERSION} ${WEBHOOK_IMAGE}:${STAGINGVERSION}_linux_amd64
+
+	docker manifest push --purge ${DRIVER_IMAGE}:${STAGINGVERSION}
+	docker manifest push --purge ${SIDECAR_IMAGE}:${STAGINGVERSION}
 	docker manifest push --purge ${WEBHOOK_IMAGE}:${STAGINGVERSION}
 
 build-image-linux-amd64:

diff --git a/test/e2e/main.go b/test/e2e/main.go
@@ -47,6 +47,7 @@ var (
 	imageRegistry          = flag.String("image-registry", "", "name of image to stage to")
 	buildGcsFuseCsiDriver  = flag.Bool("build-gcs-fuse-csi-driver", false, "whether or not to build GCS FUSE CSI Driver images")
 	buildGcsFuseFromSource = flag.Bool("build-gcs-fuse-from-source", false, "whether or not to build GCS FUSE from source code")
+	buildArm               = flag.Bool("build-arm", false, "whether or not to build the image for Arm nodes")
 	deployOverlayName      = flag.String("deploy-overlay-name", "stable", "which kustomize overlay to deploy the driver with")
 	useGKEManagedDriver    = flag.Bool("use-gke-managed-driver", false, "use GKE managed GCS FUSE CSI driver for the tests")
 
@@ -93,6 +94,7 @@ func main() {
 		DeployOverlayName:      *deployOverlayName,
 		BuildGcsFuseCsiDriver:  *buildGcsFuseCsiDriver,
 		BuildGcsFuseFromSource: *buildGcsFuseFromSource,
+		BuildArm:               *buildArm,
 		GinkgoFocus:            *ginkgoFocus,
 		GinkgoSkip:             *ginkgoSkip,
 		GinkgoProcs:            *ginkgoProcs,

diff --git a/test/e2e/utils/handler.go b/test/e2e/utils/handler.go
@@ -56,6 +56,7 @@ type TestParameters struct {
 	ImageRegistry          string
 	BuildGcsFuseCsiDriver  bool
 	BuildGcsFuseFromSource bool
+	BuildArm               bool
 	DeployOverlayName      string
 	UseGKEManagedDriver    bool
 
@@ -123,7 +124,7 @@ func Handle(testParams *TestParameters) error {
 	if !testParams.UseGKEManagedDriver {
 		if testParams.BuildGcsFuseCsiDriver {
 			klog.Infof("Building GCS FUSE CSI Driver")
-			if err := buildAndPushImage(testParams.PkgDir, testParams.ImageRegistry, testParams.BuildGcsFuseFromSource); err != nil {
+			if err := buildAndPushImage(testParams.PkgDir, testParams.ImageRegistry, testParams.BuildGcsFuseFromSource, testParams.BuildArm); err != nil {
 				return fmt.Errorf("failed pushing GCS FUSE CSI Driver images: %w", err)
 			}
 

diff --git a/test/e2e/utils/image.go b/test/e2e/utils/image.go
@@ -23,9 +23,13 @@ import (
 	"strconv"
 )
 
-func buildAndPushImage(pkgDir, registry string, buildGcsFuseFromSource bool) error {
+func buildAndPushImage(pkgDir, registry string, buildGcsFuseFromSource, buildArm bool) error {
 	//nolint:gosec
-	cmd := exec.Command("make", "-C", pkgDir, "build-image-and-push-multi-arch", fmt.Sprintf("REGISTRY=%s", registry), "BUILD_GCSFUSE_FROM_SOURCE="+strconv.FormatBool(buildGcsFuseFromSource))
+	cmd := exec.Command("make", "-C", pkgDir,
+		"build-image-and-push-multi-arch",
+		"REGISTRY="+registry,
+		"BUILD_GCSFUSE_FROM_SOURCE="+strconv.FormatBool(buildGcsFuseFromSource),
+		"BUILD_ARM="+strconv.FormatBool(buildArm))
 	if err := runCommand("Pushing image to REGISTRY "+registry, cmd); err != nil {
 		return fmt.Errorf("failed to run push image: %w", err)
 	}