Refactor build to push debug and release images

This patch refactors the build system and adds building
debug and release images for vpp and vclsidecar.
Important changes :
- we remove the --squash option which was not used in CI anyway
and that is deprecated in favor of staged builds.
- we remove tarball compression as we do not gain much disk space
but loose compression / decompression
- we fix an issue in tarball creation that was missing .so.25.06
style dynamic libraries
- we always package gdb with the images (removing WITH_GDB)
- Add Debug/Release builds for memif
- Add `make kind DEBUG=true` option for debug images

Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>

Author: sknat

.gitignore

@@ -1,12 +1,15 @@
 # Binaries
 calico-vpp-agent/bin
 vpp-manager/images/*/vpp-manager
+vpp-manager/images/*/bin
+vpp-manager/images/*/artifacts
 vpp-manager/images/*/vppdev.sh
 vpp-manager/vpp_build/
 *.deb
 *.so*
 multinet-monitor/watcher
 *.tgz
+*.tar
 
 test/k8s-e2e-tests/kubernetes-*
 test/vagrant/local-config.env

Makefile

@@ -18,13 +18,10 @@ image:
 
 .PHONY: image-kind
 image-kind: image
-	docker image tag calicovpp/vpp:$(TAG) localhost:5000/calicovpp/vpp:latest
-	docker push localhost:5000/calicovpp/vpp:latest
-	docker image tag calicovpp/agent:$(TAG) localhost:5000/calicovpp/agent:latest
-	docker push localhost:5000/calicovpp/agent:latest
-	docker image tag calicovpp/multinet-monitor:$(TAG) localhost:5000/calicovpp/multinet-monitor:latest
-	docker push localhost:5000/calicovpp/multinet-monitor:latest
-
+	@for image in vpp:$(TAG) vpp:dbg-$(TAG) vclsidecar:$(TAG) vclsidecar:dbg-$(TAG) agent:$(TAG) multinet-monitor:$(TAG); do \
+		docker image tag calicovpp/$$image localhost:5000/calicovpp/$$image ; \
+		docker push localhost:5000/calicovpp/$$image ; \
+	done
 
 .PHONY: kind-new-cluster
 kind-new-cluster:
@@ -170,7 +167,17 @@ restart-calicovpp:
 .PHONY: goapi
 export VPP_DIR ?= $(shell pwd)/vpp-manager/vpp_build
 goapi:
-	@go generate -v ./vpplink/generated/
+ifdef CI_BUILD
+	docker run -t --rm --name build_temp \
+		--user $$(id -u):$$(id -g) \
+		-e VPP_DIR=/vpp-dataplane/vpp-manager/vpp_build \
+		-v ${PROJECT_DIR}:/vpp-dataplane \
+		-w /vpp-dataplane/ \
+		calicovpp/ci-builder:latest \
+		go generate -v ./vpplink/generated/
+else
+	go generate -v ./vpplink/generated/
+endif
 
 .PHONY: cherry-vpp
 cherry-vpp:

common.mk

@@ -12,15 +12,9 @@ WITH_GDB ?= yes
 export GOOS ?= linux
 
 # Docker option
-SQUASH := --squash
 # push dependency
 PUSH_DEP := image
 
-# We make binaries static executable so that they are portable if they run outside of the calico container
-# where we have less control on the env and glibc version.
-# this is especially import for felix-api-proxy
-CGO_ENABLED := 0
-
 REGISTRIES := docker.io/
 
 # CI specific variables
@@ -33,22 +27,25 @@ ifdef CI_BUILD
 	export CI_BUILD
 	GOFLAGS := -buildvcs=false
 
+	# We make binaries static executable so that they are portable if they run outside of the calico container
+	# where we have less control on the env and glibc version.
+	# this is especially import for felix-api-proxy
 	DOCKER_OPTS  = -e CI_BUILD=1 -e GOFLAGS=${GOFLAGS}
-	DOCKER_OPTS += -e CGO_ENABLED=${CGO_ENABLED}
+	DOCKER_OPTS += -e CGO_ENABLED=0
 	DOCKER_OPTS += --user $$(id -u):$$(id -g)
 	DOCKER_OPTS += -w /vpp-dataplane/${SUB_DIR}
 	DOCKER_OPTS += -v ${PROJECT_DIR}:/vpp-dataplane
 	DOCKER_RUN = docker run -t --rm --name build_temp ${DOCKER_OPTS} calicovpp/ci-builder:latest
-	SQUASH :=
+
 	PUSH_DEP :=
 
-        # REGISTRY_PRIV may be defined in the CI environment
+    # REGISTRY_PRIV may be defined in the CI environment
 	REGISTRIES += ${REGISTRY_PRIV}
 else
-	DOCKER_RUN = CGO_ENABLED=${CGO_ENABLED} GOFLAGS=${GOFLAGS}
+	DOCKER_RUN = CGO_ENABLED=0 GOFLAGS=${GOFLAGS}
 endif
 
-TAG = $(shell git rev-parse HEAD)
+TAG = $(shell git describe --always --abbrev=40 --dirty)
 ifeq (${CODEBUILD_WEBHOOK_TRIGGER},branch/master)
 	ALSO_LATEST := y
 endif

test/kind/Makefile

@@ -1,8 +1,11 @@
+include ../../common.mk
+
 TAG ?= latest # Tag images with :$(TAG)
 N_KIND_WORKERS ?= 2
 N_KIND_CONTROL_PLANES ?= 1
 CPU_PINNING ?= false
 KIND_CALICO_VERSION ?= master
+DEBUG ?= false
 
 .PHONY: new-cluster
 new-cluster:
@@ -13,7 +16,7 @@ new-cluster:
 
 .PHONY: install-cni
 install-cni:
-	@./install_calico_vpp.sh
+	@TAG=${TAG} DEBUG=${DEBUG} ./install_calico_vpp.sh
 
 
 .PHONY: delete-cluster
@@ -22,12 +25,12 @@ delete-cluster:
 
 .PHONY: dev
 dev:
-	docker image tag calicovpp/vpp:$(TAG) localhost:5000/calicovpp/vpp:$(TAG)
-	docker push localhost:5000/calicovpp/vpp:$(TAG)
-	docker image tag calicovpp/agent:$(TAG) localhost:5000/calicovpp/agent:$(TAG)
-	docker push localhost:5000/calicovpp/agent:$(TAG)
-	docker image tag calicovpp/multinet-monitor:$(TAG) localhost:5000/calicovpp/multinet-monitor:$(TAG)
-	docker push localhost:5000/calicovpp/multinet-monitor:$(TAG)
+	docker image tag calicovpp/vpp:$(TAG) localhost:5000/calicovpp/vpp:master
+	docker push localhost:5000/calicovpp/vpp:master
+	docker image tag calicovpp/agent:$(TAG) localhost:5000/calicovpp/agent:master
+	docker push localhost:5000/calicovpp/agent:master
+	docker image tag calicovpp/multinet-monitor:$(TAG) localhost:5000/calicovpp/multinet-monitor:master
+	docker push localhost:5000/calicovpp/multinet-monitor:master
 
 # this is for a cluster using a mirror docker.io -> localhost:5000 to avoid pull rate limit
 .PHONY: load-mirror

test/kind/install_calico_vpp.sh

@@ -9,8 +9,12 @@ while [[ "$(kubectl api-resources --api-group=operator.tigera.io | grep Installa
 export TAG=${TAG:-latest}
 
 export CALICO_AGENT_IMAGE=localhost:5000/calicovpp/agent:${TAG}
-export CALICO_VPP_IMAGE=localhost:5000/calicovpp/vpp:${TAG}
 export MULTINET_MONITOR_IMAGE=localhost:5000/calicovpp/multinet-monitor:${TAG}
+if [[ "${DEBUG}" = "true" ]]; then
+	export CALICO_VPP_IMAGE=localhost:5000/calicovpp/vpp:dbg-${TAG}
+else
+	export CALICO_VPP_IMAGE=localhost:5000/calicovpp/vpp:${TAG}
+fi
 
 export IMAGE_PULL_POLICY=Always # Always Never IfNotPresent
 export CALICOVPP_ENABLE_MEMIF=true