On 07.12.2023 21:17, Andrew Cooper wrote: > On 07/12/2023 5:03 pm, Oleksii Kurochko wrote: >> ARCH_FIXED_CONFIG is required in the case of randconfig >> and CI for configs that aren't ready or are not >> supposed to be implemented for specific architecture. >> These configs should always be disabled to prevent randconfig >> related tests from failing. >> >> Signed-off-by: Oleksii Kurochko <oleksii.kuroc...@gmail.com> >> --- >> xen/Makefile | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/xen/Makefile b/xen/Makefile >> index ca571103c8..8ae8fe1480 100644 >> --- a/xen/Makefile >> +++ b/xen/Makefile >> @@ -336,11 +336,14 @@ ifeq ($(config-build),y) >> # *config targets only - make sure prerequisites are updated, and descend >> # in tools/kconfig to make the *config target >> >> +ARCH_FORCED_CONFIG := $(srctree)/arch/$(SRCARCH)/configs/randomforced.config >> + >> # Create a file for KCONFIG_ALLCONFIG which depends on the environment. >> # This will be use by kconfig targets >> allyesconfig/allmodconfig/allnoconfig/randconfig >> filechk_kconfig_allconfig = \ >> $(if $(findstring n,$(XEN_HAS_CHECKPOLICY)), echo >> 'CONFIG_XSM_FLASK_POLICY=n';) \ >> - $(if $(KCONFIG_ALLCONFIG), cat $(KCONFIG_ALLCONFIG);) \ >> + $(if $(KCONFIG_ALLCONFIG), cat $(KCONFIG_ALLCONFIG); \ >> + $(if $(wildcard $(ARCH_FORCED_CONFIG)), cat $(ARCH_FORCED_CONFIG);) ) \ >> : >> >> .allconfig.tmp: FORCE > > We already have infrastructure for this. What's wrong with > EXTRA_FIXED_RANDCONFIG?
What I don't understand here is why dealing with the issue would want limiting to gitlab-CI. Anyone could run randconfig on their own, and imo it would be helpful if the same issue(s) could be prevented there, too. Hence my earlier suggestion to have a snippet which can be used by "interested" parties. And once dealt with in e.g. the makefile there should not be a need for any overrides in the CI config anymore. Jan > ---8<--- > > CI: Revert "automation: Drop ppc64le-*randconfig jobs", fix Randconfig > with existing infrastructure > > This reverts commit cbb71b95dd708b1e26899bbe1e7bf9a85081fd60. > > Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> > > diff --git a/automation/gitlab-ci/build.yaml > b/automation/gitlab-ci/build.yaml > index 32af30ccedc9..346d0400ed09 100644 > --- a/automation/gitlab-ci/build.yaml > +++ b/automation/gitlab-ci/build.yaml > @@ -538,6 +538,7 @@ archlinux-current-gcc-riscv64-randconfig: > RANDCONFIG: y > EXTRA_FIXED_RANDCONFIG: > CONFIG_COVERAGE=n > + CONFIG_GRANT_TABLE=n > > archlinux-current-gcc-riscv64-debug-randconfig: > extends: .gcc-riscv64-cross-build-debug > @@ -547,6 +548,7 @@ archlinux-current-gcc-riscv64-debug-randconfig: > RANDCONFIG: y > EXTRA_FIXED_RANDCONFIG: > CONFIG_COVERAGE=n > + CONFIG_GRANT_TABLE=n > > # Power cross-build > debian-bullseye-gcc-ppc64le: > @@ -563,6 +565,26 @@ debian-bullseye-gcc-ppc64le-debug: > KBUILD_DEFCONFIG: ppc64_defconfig > HYPERVISOR_ONLY: y > > +debian-bullseye-gcc-ppc64le-randconfig: > + extends: .gcc-ppc64le-cross-build > + variables: > + CONTAINER: debian:bullseye-ppc64le > + KBUILD_DEFCONFIG: ppc64_defconfig > + RANDCONFIG: y > + EXTRA_FIXED_RANDCONFIG: > + CONFIG_COVERAGE=n > + CONFIG_GRANT_TABLE=n > + > +debian-bullseye-gcc-ppc64le-debug-randconfig: > + extends: .gcc-ppc64le-cross-build-debug > + variables: > + CONTAINER: debian:bullseye-ppc64le > + KBUILD_DEFCONFIG: ppc64_defconfig > + RANDCONFIG: y > + EXTRA_FIXED_RANDCONFIG: > + CONFIG_COVERAGE=n > + CONFIG_GRANT_TABLE=n > + > # Yocto test jobs > yocto-qemuarm64: > extends: .yocto-test-arm64 >
