[xen staging] CI: Force CONFIG_XEN_IBT in the buster-gcc-ibt test

[patchbot@xxxxxxx]

commit 211d8419ef8d8a237ff914fd8304b8fefc3ff2cc
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Mon Sep 26 14:02:13 2022 +0100
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxx>
CommitDate: Tue Sep 27 16:51:19 2022 -0700

    CI: Force CONFIG_XEN_IBT in the buster-gcc-ibt test
    
    buster-gcc-ibt is a dedicated test to run a not-yet-upstreamed compiler 
patch
    which is relevant to CONFIG_XEN_IBT in 4.17 and later.
    
    Force it on, rather than having 50% of the jobs not testing what they're
    supposed to be testing.
    
    Fixes: 5d59421815d5 ("x86: Use control flow typechecking where possible")
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
    [stefano: minor code style improvement]
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx>
---
 automation/gitlab-ci/build.yaml | 2 ++
 automation/scripts/build        | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index a39ed72aac..ddc2234faf 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -299,6 +299,8 @@ debian-buster-gcc-ibt:
   variables:
     CONTAINER: debian:buster-gcc-ibt
     RANDCONFIG: y
+    EXTRA_FIXED_RANDCONFIG: |
+      CONFIG_XEN_IBT=y
 
 debian-unstable-clang:
   extends: .clang-x86-64-build
diff --git a/automation/scripts/build b/automation/scripts/build
index bcfa6838f0..8c0882f3aa 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -12,6 +12,12 @@ cc-ver()
 
 # random config or default config
 if [[ "${RANDCONFIG}" == "y" ]]; then
+
+    # Append job-specific fixed configuration
+    if [[ -n "${EXTRA_FIXED_RANDCONFIG}" ]]; then
+        echo "${EXTRA_FIXED_RANDCONFIG}" >> xen/tools/kconfig/allrandom.config
+    fi
+
     make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config 
randconfig
     hypervisor_only="y"
 else
--
generated by git-patchbot for /home/xen/git/xen.git#staging