Skip to content

Commit 1b86e8d

Browse files
rbtrrbtr
authored
reenable the swift e2e pipeline (#1042)
* reenable the swift e2e pipeline Signed-off-by: Evan Baker <[email protected]> * go mod tidy and vendor Signed-off-by: Evan Baker <[email protected]> * bump to go1.17 Signed-off-by: Evan Baker <[email protected]> * vendor Signed-off-by: Evan Baker <[email protected]> * try running on host Signed-off-by: Evan Baker <[email protected]> * drop -test from pipeline versions Signed-off-by: Evan Baker <[email protected]> * update retrier Signed-off-by: Evan Baker <[email protected]>
1 parent 3510ac4 commit 1b86e8d

File tree

82 files changed

+171
-3638
lines changed

Some content is hidden

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

82 files changed

+171
-3638
lines changed

‎.github/workflows/cyclonus-netpol-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v2
2525
with:
26-
go-version: '^1.16'
26+
go-version: '^1.17'
2727

2828
- name: Setup Kind
2929
uses: engineerd/[email protected]

‎.github/workflows/repo-hygiene.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
golangci:
1313
strategy:
1414
matrix:
15-
go-version: [1.16.x]
15+
go-version: [1.17.x]
1616
os: [ubuntu-latest]
1717
name: Lint
1818
runs-on: ${{ matrix.os }}

‎.pipelines/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic multiverse" | sudo tee -a
1111
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list
1212
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic main" | sudo tee -a /etc/apt/sources.list
1313
RUN apt-get update && apt-get install -y iptables ipset iproute2 ebtables
14-
RUN wget -qO- https://golang.org/dl/go1.16.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
14+
RUN wget -qO- https://golang.org/dl/go1.17.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
1515
ENV PATH="/usr/lib/go/bin/:${PATH}"
1616
ENV GOROOT="/usr/lib/go"
1717
ENV GOPATH="/root/go"

‎.pipelines/pipeline.yaml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ stages:
2121
BUILD_NUMBER=$(Build.BuildNumber)
2222
echo "##vso[task.setvariable variable=StorageID;isOutput=true]$(echo ${BUILD_NUMBER//./-})"
2323
echo "##vso[task.setvariable variable=Tag;isOutput=true]$(git describe --tags --always --dirty)"
24-
echo "##vso[task.setvariable variable=ImageTag;isOutput=true]$(git describe --tags --always --dirty)-test"
2524
sudo chown -R $(whoami):$(whoami) .
2625
go version
2726
go env
@@ -117,8 +116,8 @@ stages:
117116
displayName: "Image Vulnerability Scan"
118117
119118
- script: |
120-
docker tag $IMAGE_REGISTRY/azure-cni-manager:$(TAG) $IMAGE_REGISTRY/azure-cni-manager:$(TAG)-test
121-
docker push $IMAGE_REGISTRY/azure-cni-manager:$(TAG)-test
119+
docker tag $IMAGE_REGISTRY/azure-cni-manager:$(TAG) $IMAGE_REGISTRY/azure-cni-manager:$(TAG)
120+
docker push $IMAGE_REGISTRY/azure-cni-manager:$(TAG)
122121
123122
function auto-retry()
124123
{
@@ -132,7 +131,7 @@ stages:
132131
133132
auto-retry docker pull $IMAGE_REGISTRY/azure-npm:$(TAG)
134133
auto-retry docker pull $IMAGE_REGISTRY/azure-cns:$(TAG)
135-
auto-retry docker pull $IMAGE_REGISTRY/azure-cni-manager:$(TAG)-test
134+
auto-retry docker pull $IMAGE_REGISTRY/azure-cni-manager:$(TAG)
136135
name: "mcrreplication"
137136
displayName: "Push NPM Image and Wait for Repository"
138137
@@ -199,11 +198,11 @@ stages:
199198
displayName: "Publish Code Coverage Results"
200199
condition: always()
201200

202-
#- template: singletenancy/aks-swift/e2e-job-template.yaml
203-
# parameters:
204-
# name: "aks_on_swift_e2e"
205-
# displayName: AKS on Swift
206-
# pipelineBuildImage: "$(BUILD_IMAGE)"
201+
- template: singletenancy/aks-swift/e2e-job-template.yaml
202+
parameters:
203+
name: "aks_swift_e2e"
204+
displayName: AKS Swift
205+
pipelineBuildImage: "$(BUILD_IMAGE)"
207206

208207
- template: singletenancy/aks-engine/e2e-job-template.yaml
209208
parameters:
@@ -238,7 +237,7 @@ stages:
238237
- stage: cleanup
239238
displayName: Cleanup
240239
dependsOn:
241-
# - "aks_on_swift_e2e"
240+
- "aks_swift_e2e"
242241
- "ubuntu_16_04_linux_e2e"
243242
- "ubuntu_18_04_linux_e2e"
244243
- "windows_19_03_e2e"

‎.pipelines/singletenancy/aks-swift/e2e-job-template.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@ stages:
99
dependsOn: build_and_test
1010
jobs:
1111
- job: ${{ parameters.name }}
12-
displayName: Singletenancy AKS on Swift Suite - (${{ parameters.name }})
12+
displayName: Singletenancy AKS Swift Suite - (${{ parameters.name }})
1313
timeoutInMinutes: 120
1414
pool:
1515
name: "$(BUILD_POOL_NAME_SWIFT)"
1616
demands:
1717
- agent.os -equals Linux
1818
- Role -equals $(CUSTOM_E2E_ROLE)
19-
container:
20-
image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibilit
2119
variables:
2220
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
2321
GOBIN: "$(GOPATH)/bin" # Go binaries path
24-
ImageTag: $[ stagedependencies.build_and_test.setup.outputs['EnvironmentalVariables.ImageTag'] ]
22+
Tag: $[ stagedependencies.build_and_test.setup.outputs['EnvironmentalVariables.Tag'] ]
2523
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
2624
steps:
2725
- template: e2e-step-template.yaml

‎.pipelines/singletenancy/aks-swift/e2e-step-template.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
displayName: "Set up the Go environment"
2222
2323
- bash: |
24-
echo $(ImageTag)
24+
echo $(Tag)
2525
displayName: Echo Tag
2626
2727
- task: AzureCLI@1
@@ -34,7 +34,7 @@ steps:
3434
echo "DNC Underlay config"
3535
az keyvault secret show --name $(KV_DNC_UNDERLAY_SECRET_NAME) --vault-name $(KV_NAME) --query value | sed 's/\\n/\n/g' | sed -e 's/^"//' -e 's/"$//'
3636
az keyvault secret show --name $(KV_DNC_UNDERLAY_SECRET_NAME) --vault-name $(KV_NAME) --query value | sed 's/\\n/\n/g' | sed -e 's/^"//' -e 's/"$//' > ~/.kube/dnc-underlay
37-
echo "Dirty ACN cx cluster config"
37+
echo "Dirty ACN ccp config"
3838
az keyvault secret show --name $(KV_AKS_SWIFT_CX_SECRET_NAME) --vault-name $(KV_NAME) --query value | sed 's/\\n/\n/g' | sed -e 's/^"//' -e 's/"$//'
3939
az keyvault secret show --name $(KV_AKS_SWIFT_CX_SECRET_NAME) --vault-name $(KV_NAME) --query value | sed 's/\\n/\n/g' | sed -e 's/^"//' -e 's/"$//' > ~/.kube/config
4040
displayName: Pull Kubeconfig from Keyvault
@@ -48,7 +48,7 @@ steps:
4848
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
4949
kubectl cluster-info
5050
kubectl get po -owide -A
51-
sudo -E env "PATH=$PATH" VERSION=$(ImageTag) INSTALL_CNI=true INSTALL_CNS=true make test-integration
51+
sudo -E env "PATH=$PATH" VERSION=$(Tag) INSTALL_CNI=true INSTALL_CNS=true make test-integration
5252
name: "aksswifte2e"
5353
displayName: "Run AKS Swift E2E"
5454
@@ -80,4 +80,4 @@ steps:
8080
sudo rm -rf test/integration/logs
8181
name: "Cleanupartifactdir"
8282
displayName: "Cleanup artifact dir"
83-
condition: always()
83+
condition: always()

‎Dockerfile.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.10
1+
FROM golang:1.17
22

33
RUN apt-get update \
44
&& apt-get install -y zip \

‎build/tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/azure/azure-container-networking/build/tools
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737

‎go.mod‎

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Azure/azure-container-networking
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
code.cloudfoundry.org/clock v1.0.0 // indirect
@@ -30,6 +30,7 @@ require (
3030
github.com/spf13/pflag v1.0.5
3131
github.com/spf13/viper v1.8.1
3232
github.com/stretchr/testify v1.7.0
33+
github.com/vishvananda/netlink v1.1.0 // indirect
3334
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
3435
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
3536
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
@@ -46,6 +47,60 @@ require (
4647
sigs.k8s.io/yaml v1.2.0
4748
)
4849

50+
require (
51+
github.com/beorn7/perks v1.0.1 // indirect
52+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
53+
github.com/containerd/cgroups v1.0.1 // indirect
54+
github.com/davecgh/go-spew v1.1.1 // indirect
55+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
56+
github.com/fsnotify/fsnotify v1.4.9 // indirect
57+
github.com/go-logr/logr v0.4.0 // indirect
58+
github.com/gogo/protobuf v1.3.2 // indirect
59+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
60+
github.com/google/gofuzz v1.1.0 // indirect
61+
github.com/googleapis/gnostic v0.5.5 // indirect
62+
github.com/hashicorp/hcl v1.0.0 // indirect
63+
github.com/hpcloud/tail v1.0.0 // indirect
64+
github.com/imdario/mergo v0.3.12 // indirect
65+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
66+
github.com/json-iterator/go v1.1.11 // indirect
67+
github.com/magiconair/properties v1.8.5 // indirect
68+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
69+
github.com/mitchellh/mapstructure v1.4.1 // indirect
70+
github.com/moby/spdystream v0.2.0 // indirect
71+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
72+
github.com/modern-go/reflect2 v1.0.1 // indirect
73+
github.com/pelletier/go-toml v1.9.3 // indirect
74+
github.com/pmezard/go-difflib v1.0.0 // indirect
75+
github.com/prometheus/common v0.26.0 // indirect
76+
github.com/prometheus/procfs v0.6.0 // indirect
77+
github.com/satori/go.uuid v1.2.0 // indirect
78+
github.com/sirupsen/logrus v1.8.1 // indirect
79+
github.com/spf13/afero v1.6.0 // indirect
80+
github.com/spf13/cast v1.3.1 // indirect
81+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
82+
github.com/subosito/gotenv v1.2.0 // indirect
83+
go.opencensus.io v0.23.0 // indirect
84+
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
85+
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
86+
golang.org/x/text v0.3.6 // indirect
87+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
88+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
89+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
90+
google.golang.org/appengine v1.6.7 // indirect
91+
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
92+
gopkg.in/fsnotify.v1 v1.4.7 // indirect
93+
gopkg.in/inf.v0 v0.9.1 // indirect
94+
gopkg.in/ini.v1 v1.62.0 // indirect
95+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
96+
gopkg.in/yaml.v2 v2.4.0 // indirect
97+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
98+
k8s.io/component-base v0.22.1 // indirect
99+
k8s.io/klog/v2 v2.9.0 // indirect
100+
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
101+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
102+
)
103+
49104
replace (
50105
github.com/Microsoft/go-winio => github.com/microsoft/go-winio v0.4.17
51106
github.com/Microsoft/hcsshim => github.com/microsoft/hcsshim v0.8.22

0 commit comments

Comments
 (0)