Skip to content

Adding a build stage for arm64 cni #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 8, 2021
Merged

Adding a build stage for arm64 cni #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
faa6e0d
Adding a build stage for arm64 cni
pjohnst5 Sep 2, 2021
05ee226
Move arm64 binaries
pjohnst5 Sep 3, 2021
ca2453e
MAking build matrix for binaries and changing pipeline to allow for that
pjohnst5 Sep 3, 2021
a2231f1
without ;
pjohnst5 Sep 3, 2021
3bb8e8f
Enable options
pjohnst5 Sep 8, 2021
d29e718
Addressed Evan's requested changes hopefully
pjohnst5 Sep 8, 2021
5c85bdd
Addressing some more changes
pjohnst5 Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,17 @@ stages:
name: "$(BUILD_POOL_NAME_DEFAULT)"
steps:
- script: |
GOOS=windows make all-binaries VERSION=$(TAG)
name: "BuildWindows"
displayName: "Build Windows"

- script: |
GOOS=linux make all-binaries VERSION=$(TAG)
name: "BuildLinux"
displayName: "Build Linux"
make all-binaries-platforms VERSION=$(TAG)
name: "BuildAllPlatformBinaries"
displayName: "Build all platform binaries"

- script: |
mkdir -p ./output/bins
cd ./output/linux_amd64
sudo find . -mindepth 2 -type f -regextype posix-extended ! -iregex '.*\.(zip|tgz)$' -delete
sudo find . -mindepth 2 -type f -print -exec mv {} ../bins \;
sudo rm -R -- */ && cd ..
cd ./windows_amd64
sudo find . -mindepth 2 -type f -regextype posix-extended ! -iregex '.*\.(zip|tgz)$' -delete
sudo find . -mindepth 2 -type f -print -exec mv {} ../bins \;
sudo rm -R -- */ && cd ..
rmdir ./linux_amd64 && rmdir ./windows_amd64
cd ./output
find . -name '*.tgz' -print -exec mv -t ./bins/ {} +
find . -name '*.zip' -print -exec mv -t ./bins/ {} +
shopt -s extglob
rm -rf !("bins")
name: "PrepareArtifacts"
displayName: "Prepare Artifacts"

Expand Down
18 changes: 12 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SHELL=/bin/bash

# Source files common to all targets.
COREFILES = \
$(wildcard common/*.go) \
Expand Down Expand Up @@ -74,6 +76,8 @@ NPMFILES = \
# Build defaults.
GOOS ?= linux
GOARCH ?= amd64
GOOSES ?= "linux windows" # To override at the cli do: GOOSES="\"darwin bsd\""
GOARCHES ?= "amd64 arm64" # To override at the cli do: GOARCHES="\"ppc64 mips\""

# Build directories.
ROOT_DIR = $(shell pwd)
Expand Down Expand Up @@ -167,6 +171,14 @@ CNS_AI_ID = ce672799-8f08-4235-8c12-08563dc2acef
cnsaipath=github.com/Azure/azure-container-networking/cns/logger.aiMetadata
ENSURE_OUTPUT_DIR_EXISTS := $(shell mkdir -p $(OUTPUT_DIR))

.PHONY: all-binaries-platforms
all-binaries-platforms: ## Make all platform binaries
@for goos in "$(GOOSES)"; do \
for goarch in "$(GOARCHES)"; do \
make all-binaries GOOS=$$goos GOARCH=$$goarch; \
done \
done

# Shorthand target names for convenience.
azure-cnm-plugin: $(CNM_BUILD_DIR)/azure-vnet-plugin$(EXE_EXT) cnm-archive
azure-vnet: $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT)
Expand Down Expand Up @@ -269,12 +281,6 @@ all-containerized:
docker rm $(BUILD_CONTAINER_NAME)
docker rmi $(BUILD_CONTAINER_IMAGE):$(VERSION)

# Make both linux and windows binaries
.PHONY: all-binaries-platforms
all-binaries-platforms:
export GOOS=linux; make all-binaries
export GOOS=windows; make all-binaries


.PHONY: tools
tools: acncli
Expand Down