Split build-gating plan to two to avoid disk usage issues
Kernel rebuild is pretty hungry, and may starve out the rest of the tests. By putting it in its own plan, CI systems will run it on its own dedicated box.
This commit is contained in:
parent
b99ecb3c2f
commit
39aa418580
5 changed files with 32 additions and 6 deletions
|
|
@ -4,10 +4,6 @@
|
|||
|
||||
summary: "Build/PR gating tests for binutils"
|
||||
|
||||
discover:
|
||||
how: fmf
|
||||
filter: "tag:gate-build"
|
||||
|
||||
# Adjust rules
|
||||
adjust+:
|
||||
- because: "Plan to be ran when executed locally, or executed by CI system to gate a build or PR."
|
||||
|
|
@ -38,3 +34,15 @@ adjust+:
|
|||
script:
|
||||
- dnf config-manager --set-enabled rhel-CRB
|
||||
- dnf config-manager --set-enabled rhel-buildroot
|
||||
|
||||
/common:
|
||||
discover:
|
||||
- how: fmf
|
||||
filter: "tag:gate-build"
|
||||
exclude: '^/tests/Sanity/rebuild-kernel-and-reboot$'
|
||||
|
||||
/kernel-rebuild:
|
||||
discover:
|
||||
- how: fmf
|
||||
filter: "tag:gate-build"
|
||||
test: '^/tests/Sanity/rebuild-kernel-and-reboot$'
|
||||
|
|
|
|||
|
|
@ -48,6 +48,11 @@ require+:
|
|||
|
||||
# Adjust rules
|
||||
adjust+:
|
||||
- because: "kernel package is gone from Fedora Rawhide default installation"
|
||||
when: distro == fedora-rawhide
|
||||
environment+:
|
||||
KERNEL: kernel-core
|
||||
|
||||
- because: "python-devel has different names in different distros"
|
||||
when: distro == rhel-8.9.0
|
||||
require+:
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ esac
|
|||
# name (e.g. kernel-PAE).
|
||||
KERNEL="${KERNEL:-kernel}"
|
||||
|
||||
RPM_BUILD_ID="${RPM_BUILD_ID:-.LimeKitten}"
|
||||
RPM_BUILD_ID="${RPM_BUILD_ID:-.LK}"
|
||||
|
||||
# Workaround possible restraint issues - restraint may fail to set REBOOTCOUNT properly.
|
||||
REBOOT_FLAG=/.rebuild-kernel-and-reboot.flag
|
||||
|
|
@ -82,6 +82,11 @@ rlJournalStart
|
|||
rlLogInfo " $line"
|
||||
done
|
||||
|
||||
rlLogInfo 'Installed packages:'
|
||||
rpm -qa | sort | while read line; do
|
||||
rlLogInfo " $line"
|
||||
done
|
||||
|
||||
rlRun "AFTER_REBOOT=no"
|
||||
|
||||
if [ "$REBOOTCOUNT" != "0" ]; then
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@
|
|||
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
BU_TMPDIR_PARENT="${BU_TMPDIR_PARENT:-/tmp}"
|
||||
|
||||
|
||||
function buTestHeader () {
|
||||
_LD="$(which ld)"
|
||||
_GCC="$(which gcc)"
|
||||
|
|
@ -16,6 +19,7 @@ function buTestHeader () {
|
|||
rlLogInfo "COLLECTION_PACKAGES=$COLLECTION_PACKAGES"
|
||||
rlLogInfo "LD=$_LD"
|
||||
rlLogInfo "GCC=$_GCC"
|
||||
rlLogInfo "BU_TMPDIR_PARENT=$BU_TMPDIR_PARENT"
|
||||
|
||||
rlAssertRpm --all
|
||||
|
||||
|
|
@ -44,7 +48,7 @@ function buTestHeader () {
|
|||
|
||||
|
||||
function buEnterTmpDir () {
|
||||
rlRun "export TmpDir=$(mktemp -d)" 0 "Creating tmp directory"
|
||||
rlRun "export TmpDir=$(mktemp -d -p $BU_TMPDIR_PARENT)" 0 "Creating tmp directory"
|
||||
rlRun "pushd $TmpDir"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,10 @@ require+:
|
|||
|
||||
# Adjust rules
|
||||
adjust+:
|
||||
- when: distro == fedora-rawhide,rhel-9
|
||||
environment+:
|
||||
BU_TMPDIR_PARENT: "/"
|
||||
|
||||
# RHEL-9 / no collection
|
||||
- when: distro == rhel-9 and collection is not defined
|
||||
require+:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue