add multi arch build to postsubmit in GCB

Signed-off-by: Patrik Cyvoct <[email protected]>

Author: Sh4d1

Dockerfile.in

@@ -21,13 +21,9 @@ RUN clean-install libsystemd0 bash
 # Avoid symlink of /etc/localtime.
 RUN test -h /etc/localtime && rm -f /etc/localtime && cp /usr/share/zoneinfo/UTC /etc/localtime || true
 
-<<<<<<< HEAD
-ADD ./bin/node-problem-detector /node-problem-detector
+ADD ./bin/node-problem-detector-BINARCH /node-problem-detector
 
 # Below command depends on ENABLE_JOURNAL=1.
-
-ADD ./bin/log-counter-BINARCH /home/kubernetes/bin/log-counter
-ADD ./bin/node-problem-detector-BINARCH /node-problem-detector
 ADD ./bin/log-counter-BINARCH /home/kubernetes/bin/log-counter
 ADD config /config
 ENTRYPOINT ["/node-problem-detector", "--system-log-monitors=/config/kernel-monitor.json"]

Makefile

@@ -18,7 +18,8 @@
 		clean vet fmt version \
         Dockerfile build-binaries docker-builder build-in-docker \
 		build-all build-all-container \
-        build-tar-all push-all push-all-container push-manifest push-tar-all qemu-register
+        build-tar-all push-all push-all-container push-manifest push-tar-all qemu-register \
+		release-staging
 
 TEMP_DIR := $(shell mktemp -d)
 
@@ -40,6 +41,9 @@ export DOCKER_CLI_EXPERIMENTAL := enabled
 # REGISTRY is the container registry to push into.
 REGISTRY?=staging-k8s.gcr.io
 
+# STAGING_REGISTRY is the new registry for staging
+STAGING_REGISTRY?=gcr.io/k8s-staging-npd
+
 # UPLOAD_PATH is the cloud storage path to upload release tar.
 UPLOAD_PATH?=gs://kubernetes-release
 # Trim the trailing '/' in the path
@@ -123,6 +127,7 @@ version:
 	@echo $(VERSION)
 
 ./bin/log-counter: $(PKG_SOURCES)
+ifeq ($(ENABLE_JOURNALD), 1)
 	CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GOARCH=$(ARCH) GO111MODULE=on go build \
 		-mod vendor \
 		-o bin/log-counter-$(ARCH) \
@@ -190,20 +195,16 @@ build-container-%: qemu-register
 build-container: clean build-in-docker Dockerfile
 	docker build -t $(IMAGE_WITH_ARCH) .
 
-build-tar: build-in-docker
-	cp bin/node-problem-detector-amd64 bin/node-problem-detector
-	cp bin/log-counter-amd64 bin/log-counter
-	cp bin/problem-maker-amd64 bin/problem-maker
-	tar -zcvf $(TARBALL) bin/ config/ test/e2e-install.sh
+build-tar: ./bin/node-problem-detector ./bin/log-counter ./test/bin/problem-maker
+	tar -zcvf $(TARBALL) bin/ config/ test/e2e-install.sh test/bin/problem-maker
 	sha1sum $(TARBALL)
 	md5sum $(TARBALL)
 
 build-tar-all:
 	@for arch in $(ALL_ARCH); do $(MAKE) ARCH=$${arch} build-in-docker; done
 	cp bin/node-problem-detector-amd64 bin/node-problem-detector
 	cp bin/log-counter-amd64 bin/log-counter
-	cp bin/problem-maker-amd64 bin/problem-maker
-	tar -zcvf $(TARBALL-ALL) bin/ config/ test/e2e-install.sh
+	tar -zcvf $(TARBALL-ALL) bin/ config/ test/e2e-install.sh 
 	sha1sum $(TARBALL-ALL)
 	md5sum $(TARBALL-ALL)
 
@@ -221,7 +222,7 @@ build-in-docker: clean docker-builder
 		-v `pwd`:/gopath/src/k8s.io/node-problem-detector/ npd-builder:latest bash \
 		-c 'cd /gopath/src/k8s.io/node-problem-detector/ && make build-binaries'
 
-push-all-container: build-all-container
+push-all-container: build-all-container $(addprefix push-container-,$(ALL_ARCH))
 
 push-container-%:
 	$(MAKE) ARCH=$* push-container
@@ -246,6 +247,9 @@ push-all: push-all-container push-manifest push-tar-all
 
 push: push-container push-tar
 
+release-staging:
+	REGISTRY=$(STAGING_REGISTRY) $(MAKE) push-all
+
 clean:
 	rm -f bin/log-counter*
 	rm -f bin/node-problem-detector*

cloudbuild.yaml

@@ -0,0 +1,17 @@
+timeout: 1200s
+options:
+  substitution_option: ALLOW_LOOSE
+steps:
+  - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20190906-745fed4'
+    entrypoint: make
+    env:
+    - TAG=$_GIT_TAG
+    - BASE_REF=$_PULL_BASE_REF
+    - DOCKER_CLI_EXPERIMENTAL=enabled
+    args:
+    - release-staging
+substitutions:
+  # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
+  # can be used as a substitution
+  _GIT_TAG: '12345'
+  _PULL_BASE_REF: 'dev'