Skip to content

Commit 38dc38e

Browse files
authored
Move NPM from dep to go mod (#539)
* Moving NPM to use gomod * Vendoring via go mod * add more npm tests * remove go dep specific commands * adding pipeline changes
1 parent 2427888 commit 38dc38e

File tree

2,465 files changed

+852682
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,465 files changed

+852682
-329
lines changed

.pipelines/pipeline.yaml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ stages:
3030
steps:
3131
- bash: |
3232
echo $UID
33+
sudo rm -rf $(System.DefaultWorkingDirectory)/*
3334
sudo rm /run/docker/plugins/test.sock || true
3435
sudo ip link del dev dummy || true
3536
displayName: "Set up OS environment"
3637
38+
- checkout: self
39+
3740
- bash: |
3841
go version
3942
go env
@@ -62,7 +65,6 @@ stages:
6265
condition: always()
6366
6467
- script: |
65-
go get -v -t -d ./...
6668
go get github.com/docker/libnetwork/driverapi
6769
go get github.com/gorilla/mux
6870
go get github.com/jstemmer/go-junit-report
@@ -80,19 +82,11 @@ stages:
8082
make all-binaries VERSION=$(EnvironmentalVariables.Tag)
8183
export GOOS=linux
8284
make all-binaries VERSION=$(EnvironmentalVariables.Tag)
85+
sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
8386
workingDirectory: "$(modulePath)"
8487
name: "Build"
8588
displayName: "Build"
8689
87-
- script: |
88-
sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
89-
echo '$(DOCKER_PASSWORD)' | docker login containernetworking.azurecr.io -u '$(DOCKER_USERNAME)' --password-stdin
90-
docker tag $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag) $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
91-
docker push $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
92-
workingDirectory: "$(modulePath)"
93-
name: "PushImages"
94-
displayName: "PushNPMImage"
95-
9690
- bash: |
9791
cd ./output
9892
sudo find . -mindepth 2 -type f -regextype posix-extended ! -iregex '.*\.(zip|tgz)$' -delete
@@ -122,6 +116,10 @@ stages:
122116
condition: always()
123117
124118
- script: |
119+
echo '$(DOCKER_PASSWORD)' | docker login containernetworking.azurecr.io -u '$(DOCKER_USERNAME)' --password-stdin
120+
docker tag $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag) $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
121+
docker push $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
122+
125123
function auto-retry()
126124
{
127125
export i="1"
@@ -134,18 +132,20 @@ stages:
134132
auto-retry docker pull mcr.microsoft.com/containernetworking/azure-npm:$(EnvironmentalVariables.Tag)-test
135133
workingDirectory: "$(modulePath)"
136134
name: "mcrreplication"
137-
displayName: "Wait for MCR"
135+
displayName: "Push NPM Image and Wait for MCR"
138136
139137
- task: PublishTestResults@2
140138
inputs:
141139
testRunner: JUnit
142-
testResultsFiles: $(System.DefaultWorkingDirectory)/**/report.xml
140+
testResultsFiles: $(modulePath)/report.xml
141+
displayName: "Publish Test Results"
143142
condition: always()
144143

145144
- task: PublishCodeCoverageResults@1
146145
inputs:
147146
codeCoverageTool: Cobertura
148-
summaryFileLocation: $(System.DefaultWorkingDirectory)/**/coverage.xml
147+
summaryFileLocation: $(modulePath)/coverage.xml
148+
displayName: "Publish Code Coverage Results"
149149
condition: always()
150150

151151
- task: CopyFiles@2
@@ -220,6 +220,7 @@ stages:
220220
container:
221221
image: "$(BUILD_IMAGE)"
222222
steps:
223+
- checkout: none
223224
- task: AzureCLI@1
224225
inputs:
225226
azureSubscription: $(ARTIFACT_SUBSCRIPTION)

Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ $(CNMS_BUILD_DIR)/azure-cnms$(EXE_EXT): $(CNMSFILES)
198198

199199
# Build the Azure NPM plugin.
200200
$(NPM_BUILD_DIR)/azure-npm$(EXE_EXT): $(NPMFILES)
201-
cd $(NPM_DIR)
202-
cd $(CNI_TELEMETRY_DIR) && go build -v -o $(ROOT_DIR)/$(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" ./*.go
203-
cd $(NPM_DIR) && go build -v -o $(ROOT_DIR)/$(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/npm.aiMetadata=$(NPM_AI_ID) -s -w" ./*.go
201+
go build -v -o $(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(CNI_TELEMETRY_DIR)/*.go
202+
go build -v -o $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/npm.aiMetadata=$(NPM_AI_ID) -s -w" $(NPM_DIR)/*.go
203+
204204
# Build all binaries in a container.
205205
.PHONY: all-containerized
206206
all-containerized:
@@ -370,8 +370,6 @@ test-all:
370370
./aitelemetry/ \
371371
./cnm/network/ \
372372
./cni/ipam/ \
373-
./cns/ipamclient/
374-
cd npm/ && go test -v -covermode count -coverprofile=coverage-npm.out \
375-
./iptm/ \
376-
./ipsm/ \
377-
./
373+
./cns/ipamclient/ \
374+
./npm/iptm/ \
375+
./npm/ipsm/

npm/go.mod

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)