From 99e26c120f915474c077f6dce0a83e65aa638c0a Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Fri, 9 Sep 2022 11:34:02 -0400 Subject: [PATCH] build: change make verify gate os to ubuntu 22.04 - Also fix log output to remove hardcoded compiler version Type: make Change-Id: I1b224d8e9a042c58dbae689a8be706089cc1377f Signed-off-by: Dave Wallace --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4d3ba7578f6..6b5ec77f557 100644 --- a/Makefile +++ b/Makefile @@ -740,7 +740,7 @@ docs: .PHONY: pkg-verify pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps - $(call banner,"Building for PLATFORM=vpp using gcc") + $(call banner,"Building for PLATFORM=vpp") @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages $(call banner,"Building sample-plugin") @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install @@ -749,7 +749,8 @@ pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) -MAKE_VERIFY_GATE_OS ?= ubuntu-20.04 +# Note: 'make verify' target is not used by ci-management scripts +MAKE_VERIFY_GATE_OS ?= ubuntu-22.04 .PHONY: verify verify: pkg-verify ifeq ($(OS_ID)-$(OS_VERSION_ID),$(MAKE_VERIFY_GATE_OS)) -- 2.16.6