Skip to content

Commit 63ddcef

Browse files
committed
fixup! Edit Pipeline Trigger
1 parent 2af6e22 commit 63ddcef

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

.pipelines/build/generate-manifest.steps.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ steps:
1111
jq -r '.[] |
1212
.args = [ (.platform | split("/")[0]), (.platform | split("/")[1]) ] |
1313
.args = [ ("--os " + .args[0] ), ("--arch " + .args[1] ) ] |
14-
if .osVersion then .args += ["--os-version " + .osVersion] else . end |
1514
{ image: .imageReference, annotate: .args }' | \
1615
jq -rcs)
1716
echo >&2 "##vso[task.setvariable variable=MANIFEST_JSON;isOutput=true]$MANIFEST_DATA"

.pipelines/build/image.steps.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ parameters:
1111
type: string
1212
default: ""
1313

14-
- name: os_version
15-
type: string
16-
default: ""
17-
1814
- name: build_tag
1915
type: string
2016
default: ""

.pipelines/run-pipeline.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ stages:
2727
- setup
2828
- unittest
2929
variables:
30-
ACN_DIR: azure-container-networking
30+
ACN_DIR: drop_setup_env_source
3131
ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
3232
CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
3333
CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
@@ -177,11 +177,10 @@ stages:
177177
matrix:
178178
azure_ipam:
179179
name: azure-ipam
180-
osVersion: ltsc2022
181180
dockerfilePath: $(ACN_DIR)/azure-ipam
182181
extraArgs: ''
183182
archiveName: azure-ipam
184-
archiveVersion: $(OS)-$(ARCH)-$(AZURE_IPAM_VERSION)-ltsc2022
183+
archiveVersion: $(OS)-$(ARCH)-$(AZURE_IPAM_VERSION)
185184
imageTag: $(Build.BuildNumber)
186185
cni:
187186
name: cni
@@ -213,7 +212,6 @@ stages:
213212
parameters:
214213
arch: $(ARCH)
215214
os: $(OS)
216-
os_version: $(osVersion)
217215
name: $(name)
218216
dockerfile_path: $(dockerfilePath)
219217
build_tag: $(imageTag)

0 commit comments

Comments
 (0)