Skip to content

Commit 421592f

Browse files
sheylatrudosheylatrudo
committed
fixup! Address PR Comments
1 parent 4b971a2 commit 421592f

File tree

12 files changed

+25
-19
lines changed

12 files changed

+25
-19
lines changed

‎.pipelines/build/ob-prepare.steps.yaml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,36 +44,40 @@ steps:
4444
4545
STORAGE_ID=$(echo "${BUILD_BUILDNUMBER//./-}")
4646
echo "##vso[task.setvariable variable=StorageID;isOutput=true]$STORAGE_ID"
47-
echo "STORAGE_ID: $STORAGE_ID"
47+
echo "StorageID: $STORAGE_ID"
4848
4949
COMMITID=$(git rev-parse --short HEAD)
5050
COMMITID="$COMMITID"-"$(date "+%d%H%M")"
5151
echo "##vso[task.setvariable variable=commitID;isOutput=true]$COMMITID"
52-
echo "COMMITID: $COMMITID"
52+
echo "commitID: $COMMITID"
5353
5454
TAG=$(make version)
5555
echo "##vso[task.setvariable variable=Tag;isOutput=true]$TAG"
56-
echo "TAG: $TAG"
56+
echo "Tag: $TAG"
57+
58+
IMAGEREPOPATH="artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy"
59+
echo "##vso[task.setvariable variable=imageRepositoryPath;isOutput=true]$IMAGEREPOPATH"
60+
echo "imageRepositoryPath: $IMAGEREPOPATH"
5761
5862
AZUREIPAMVERSION=$(make azure-ipam-version)
5963
echo "##vso[task.setvariable variable=azureIpamVersion;isOutput=true]$AZUREIPAMVERSION"
60-
echo "AZUREIPAMVERSION: $AZUREIPAMVERSION"
64+
echo "azureIpamVersion: $AZUREIPAMVERSION"
6165
6266
CNIVERSION=$(make cni-version)
6367
echo "##vso[task.setvariable variable=cniVersion;isOutput=true]$CNIVERSION"
64-
echo "CNIVERSION: $CNIVERSION"
68+
echo "cniVersion: $CNIVERSION"
6569
6670
CNSVERSION=$(make cns-version)
6771
echo "##vso[task.setvariable variable=cnsVersion;isOutput=true]$CNSVERSION"
68-
echo "CNSVERSION: $CNSVERSION"
72+
echo "cnsVersion: $CNSVERSION"
6973
7074
IPV6HPBPFVERSION=$(make ipv6-hp-bpf-version)
7175
echo "##vso[task.setvariable variable=ipv6HpBpfVersion;isOutput=true]$IPV6HPBPFVERSION"
72-
echo "IPV6HPBPFVERSION: $IPV6HPBPFVERSION"
76+
echo "ipv6HpBpfVersion: $IPV6HPBPFVERSION"
7377
7478
NPMVERSION=$(make npm-version)
7579
echo "##vso[task.setvariable variable=npmVersion;isOutput=true]$NPMVERSION"
76-
echo "NPMVERSION: $NPMVERSION"
80+
echo "npmVersion: $NPMVERSION"
7781
7882
cat /etc/os-release
7983
uname -a

‎.pipelines/run-pipeline.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ stages:
3535

3636
STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
3737
TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
38+
39+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
3840
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
3941
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
4042
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
@@ -302,7 +304,7 @@ stages:
302304
- setup
303305
- build
304306
variables:
305-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
307+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
306308

307309
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
308310
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]

‎.pipelines/singletenancy/aks-swift/e2e.stages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ stages:
4646
GOBIN: "$(GOPATH)/bin" # Go binaries path
4747
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4848

49-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
49+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
5050
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
5151
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
5252
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]

‎.pipelines/singletenancy/aks/e2e.stages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ stages:
4646
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
4747

4848
AZURE_REGISTRY: acnpublic.azurecr.io
49-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
49+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
5050
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
5151
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
5252
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]

‎.pipelines/singletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e.stages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ stages:
4747
GOBIN: "$(GOPATH)/bin" # Go binaries path
4848
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4949

50-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
50+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
5151
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
5252
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
5353
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]

‎.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e.stages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ stages:
4646
GOBIN: "$(GOPATH)/bin" # Go binaries path
4747
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4848

49-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
49+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
5050
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
5151
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
5252
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]

‎.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.stages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ stages:
4343
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
4444

4545
IPV6_IMAGE_REGISTRY: acnpublic.azurecr.io
46-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
46+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
4747
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
4848
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
4949
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]

‎.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e.stages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ stages:
4343
GOBIN: "$(GOPATH)/bin" # Go binaries path
4444
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4545

46-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
46+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
4747
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
4848
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
4949
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]

‎.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e.stages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stages:
4444
GOBIN: "$(GOPATH)/bin" # Go binaries path
4545
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4646

47-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
47+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
4848
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
4949
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
5050
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]

‎.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e.stages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ stages:
4343
GOBIN: "$(GOPATH)/bin" # Go binaries path
4444
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
4545

46-
IMAGE_REPO_PATH: 'artifact/dd590928-4e04-48cb-9d3d-ee06c5f0e17f/buddy'
46+
IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
4747
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
4848
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
4949
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]

0 commit comments

Comments
 (0)