Skip to content

ci: Remove File Copy and Add Image Build Stage to Regular Build #3769

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 2 commits into from
Jul 3, 2025
Merged

ci: Remove File Copy and Add Image Build Stage to Regular Build #3769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a8fbe7
Remove File Copy
sheylatrudo Jul 2, 2025
8395929
Add Image Builds to Regular Pipeline Execution
sheylatrudo Jul 2, 2025
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
317 changes: 158 additions & 159 deletions .pipelines/run-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,167 +20,166 @@ stages:

- template: templates/run-unit-tests.stages.yaml


- ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }}:
- stage: build
displayName: "Build Project"
dependsOn:
- setup
- unittest
variables:
ACN_DIR: drop_setup_env_source
ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata

STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]

IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
jobs:
- template: /.pipelines/build/images.jobs.yaml
parameters:
images:
- job: linux_amd64
displayName: "Linux/AMD64"
templateContext:
repositoryArtifact: drop_setup_env_source
buildScript: .pipelines/build/scripts/$(name).sh
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
strategy:
maxParallel: 5
matrix:
azure_ipam:
name: azure-ipam
extraArgs: ''
archiveName: azure-ipam
archiveVersion: $(AZURE_IPAM_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
azure_ip_masq_merger:
name: azure-ip-masq-merger
extraArgs: ''
archiveName: azure-ip-masq-merger
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
imageTag: $(Build.BuildNumber)
cni:
name: cni
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
archiveName: azure-cni
archiveVersion: $(CNI_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
cns:
name: cns
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
archiveName: azure-cns
archiveVersion: $(CNS_VERSION)
imageTag: $(Build.BuildNumber)
ipv6_hp_bpf:
name: ipv6-hp-bpf
extraArgs: "--build-arg DEBUG=$(System.Debug)"
archiveName: ipv6-hp-bpf
archiveVersion: $(IPV6_HP_BPF_VERSION)
imageTag: $(Build.BuildNumber)
# npm:
# name: npm
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
# archiveName: azure-npm
# archiveVersion: $(NPM_VERSION)
# imageTag: $(Build.BuildNumber)

- job: windows_amd64
displayName: "Windows"
templateContext:
repositoryArtifact: drop_setup_env_source
buildScript: .pipelines/build/scripts/$(name).sh
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
strategy:
maxParallel: 5
matrix:
azure_ipam:
name: azure-ipam
extraArgs: ''
archiveName: azure-ipam
archiveVersion: $(AZURE_IPAM_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
cni:
name: cni
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
archiveName: azure-cni
archiveVersion: $(CNI_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
cns:
name: cns
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
archiveName: azure-cns
archiveVersion: $(CNS_VERSION)
imageTag: $(Build.BuildNumber)
# npm:
# name: npm
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
# archiveName: azure-npm
# archiveVersion: $(NPM_VERSION)
# imageTag: $(Build.BuildNumber)

- job: linux_arm64
displayName: "Linux/ARM64"
templateContext:
repositoryArtifact: drop_setup_env_source
buildScript: .pipelines/build/scripts/$(name).sh
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
strategy:
maxParallel: 3
matrix:
azure_ipam:
name: azure-ipam
archiveName: azure-ipam
archiveVersion: $(AZURE_IPAM_VERSION)
extraArgs: ''
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
azure_ip_masq_merger:
name: azure-ip-masq-merger
extraArgs: ''
archiveName: azure-ip-masq-merger
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
imageTag: $(Build.BuildNumber)
cni:
name: cni
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
archiveName: azure-cni
archiveVersion: $(CNI_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
cns:
name: cns
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
archiveName: azure-cns
archiveVersion: $(CNS_VERSION)
imageTag: $(Build.BuildNumber)
ipv6_hp_bpf:
name: ipv6-hp-bpf
extraArgs: "--build-arg DEBUG=$(System.Debug)"
archiveName: ipv6-hp-bpf
archiveVersion: $(IPV6_HP_BPF_VERSION)
imageTag: $(Build.BuildNumber)
# npm:
# name: npm
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
# archiveName: azure-npm
# archiveVersion: $(NPM_VERSION)
# imageTag: $(Build.BuildNumber)
- stage: build
displayName: "Build Project"
dependsOn:
- setup
- unittest
variables:
ACN_DIR: drop_setup_env_source
ACN_PACKAGE_PATH: github.com/Azure/azure-container-networking
CNI_AI_PATH: $(ACN_PACKAGE_PATH)/telemetry.aiMetadata
CNS_AI_PATH: $(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
NPM_AI_PATH: $(ACN_PACKAGE_PATH)/npm.aiMetadata

STORAGE_ID: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]

IMAGE_REPO_PATH: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath'] ]
AZURE_IPAM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpamVersion'] ]
AZURE_IP_MASQ_MERGER_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.azureIpMasqMergerVersion'] ]
CNI_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
CNS_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
IPV6_HP_BPF_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.ipv6HpBpfVersion'] ]
NPM_VERSION: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
jobs:
- template: /.pipelines/build/images.jobs.yaml
parameters:
images:
- job: linux_amd64
displayName: "Linux/AMD64"
templateContext:
repositoryArtifact: drop_setup_env_source
buildScript: .pipelines/build/scripts/$(name).sh
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
strategy:
maxParallel: 5
matrix:
azure_ipam:
name: azure-ipam
extraArgs: ''
archiveName: azure-ipam
archiveVersion: $(AZURE_IPAM_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
azure_ip_masq_merger:
name: azure-ip-masq-merger
extraArgs: ''
archiveName: azure-ip-masq-merger
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
imageTag: $(Build.BuildNumber)
cni:
name: cni
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
archiveName: azure-cni
archiveVersion: $(CNI_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
cns:
name: cns
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
archiveName: azure-cns
archiveVersion: $(CNS_VERSION)
imageTag: $(Build.BuildNumber)
ipv6_hp_bpf:
name: ipv6-hp-bpf
extraArgs: "--build-arg DEBUG=$(System.Debug)"
archiveName: ipv6-hp-bpf
archiveVersion: $(IPV6_HP_BPF_VERSION)
imageTag: $(Build.BuildNumber)
# npm:
# name: npm
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
# archiveName: azure-npm
# archiveVersion: $(NPM_VERSION)
# imageTag: $(Build.BuildNumber)

- job: windows_amd64
displayName: "Windows"
templateContext:
repositoryArtifact: drop_setup_env_source
buildScript: .pipelines/build/scripts/$(name).sh
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
strategy:
maxParallel: 5
matrix:
azure_ipam:
name: azure-ipam
extraArgs: ''
archiveName: azure-ipam
archiveVersion: $(AZURE_IPAM_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
cni:
name: cni
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
archiveName: azure-cni
archiveVersion: $(CNI_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
cns:
name: cns
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
archiveName: azure-cns
archiveVersion: $(CNS_VERSION)
imageTag: $(Build.BuildNumber)
# npm:
# name: npm
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
# archiveName: azure-npm
# archiveVersion: $(NPM_VERSION)
# imageTag: $(Build.BuildNumber)

- job: linux_arm64
displayName: "Linux/ARM64"
templateContext:
repositoryArtifact: drop_setup_env_source
buildScript: .pipelines/build/scripts/$(name).sh
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
strategy:
maxParallel: 3
matrix:
azure_ipam:
name: azure-ipam
archiveName: azure-ipam
archiveVersion: $(AZURE_IPAM_VERSION)
extraArgs: ''
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
azure_ip_masq_merger:
name: azure-ip-masq-merger
extraArgs: ''
archiveName: azure-ip-masq-merger
archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
imageTag: $(Build.BuildNumber)
cni:
name: cni
extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
archiveName: azure-cni
archiveVersion: $(CNI_VERSION)
imageTag: $(Build.BuildNumber)
packageWithDropGZ: True
cns:
name: cns
extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
archiveName: azure-cns
archiveVersion: $(CNS_VERSION)
imageTag: $(Build.BuildNumber)
ipv6_hp_bpf:
name: ipv6-hp-bpf
extraArgs: "--build-arg DEBUG=$(System.Debug)"
archiveName: ipv6-hp-bpf
archiveVersion: $(IPV6_HP_BPF_VERSION)
imageTag: $(Build.BuildNumber)
# npm:
# name: npm
# extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
# archiveName: azure-npm
# archiveVersion: $(NPM_VERSION)
# imageTag: $(Build.BuildNumber)


- ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }}:
- stage: manifests
displayName: "Image Manifests"
dependsOn:
Expand Down
1 change: 0 additions & 1 deletion .pipelines/templates/run-unit-tests.stages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ stages:
} | { read xs; exit $xs; }
} 4>&1
cp coverage-all.out "$COVERAGE_OUT"
ls -la "$REPORT_DIR"
retryCountOnTaskFailure: 3
displayName: "Run Unit Tests - Linux"
Expand Down
Loading