Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .azure-pipelines/azure-pipelines-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ jobs:
variables:
PLATFORM_ARCH: arm64

- name: aspeed-arm64
pool: sonicso1ES-arm64
variables:
PLATFORM_NAME: aspeed
PLATFORM_ARCH: arm64

- name: vpp
variables:
dbg_image: yes
Expand Down
5 changes: 5 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ stages:
pool: sonicso1ES-arm64
variables:
PLATFORM_ARCH: arm64
- name: aspeed-arm64
pool: sonicso1ES-arm64
variables:
PLATFORM_NAME: aspeed
PLATFORM_ARCH: arm64

- stage: Test
dependsOn: BuildVS
Expand Down
5 changes: 3 additions & 2 deletions platform/aspeed/one-image.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
DISABLED_PACKAGES_LOCAL = $(DOCKER_DHCP_RELAY) $(DOCKER_SFLOW) $(DOCKER_MGMT_FRAMEWORK) \
$(DOCKER_NAT) $(DOCKER_TEAMD) $(DOCKER_ROUTER_ADVERTISER) \
$(DOCKER_MUX) $(DOCKER_MACSEC) \
$(DOCKER_EVENTD) $(DOCKER_DASH_HA) $(DOCKER_STP)
$(DOCKER_EVENTD) $(DOCKER_DASH_HA) $(DOCKER_STP) \
$(DOCKER_RESTAPI)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor issue: is this change still needed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is still needed. The DISABLED_PACKAGES_LOCAL + filter-out prevents these docker images from being built at all — removing them from _DOCKERS only prevents inclusion in the final image, but they'd still be compiled, wasting CI time on the arm64 runner. This follows the same pattern used by Pensando and NVIDIA Bluefield platforms.

The `` line is a debug print showing which packages are filtered — happy to remove it if you prefer cleaner output.

$(info [aspeed] Filtering out packages: $(DISABLED_PACKAGES_LOCAL))
SONIC_PACKAGES_LOCAL := $(filter-out $(DISABLED_PACKAGES_LOCAL), $(SONIC_PACKAGES_LOCAL))
Expand All @@ -21,5 +22,5 @@ $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(NEXTHOP_COMMON_PLATFORM_MODULE)
$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(ASPEED_NEXTHOP_B27_PLATFORM_MODULE)

# $(SONIC_ONE_IMAGE)_DOCKERS = $(DOCKER_DATABASE) $(DOCKER_GNMI) $(DOCKER_RESTAPI) $(DOCKER_PLATFORM_MONITOR) $(DOCKER_LLDP) $(DOCKER_TELEMETRY) $(DOCKER_SYSMGR) $(DOCKER_OBMC_CONSOLE) $(DOCKER_BMCWEB)
$(SONIC_ONE_IMAGE)_DOCKERS = $(DOCKER_DATABASE) $(DOCKER_GNMI) $(DOCKER_RESTAPI) $(DOCKER_PLATFORM_MONITOR) $(DOCKER_LLDP) $(DOCKER_TELEMETRY) $(DOCKER_SYSMGR)
$(SONIC_ONE_IMAGE)_DOCKERS = $(DOCKER_DATABASE) $(DOCKER_GNMI) $(DOCKER_PLATFORM_MONITOR) $(DOCKER_LLDP) $(DOCKER_TELEMETRY) $(DOCKER_SYSMGR)
SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
Loading