Skip to content

Commit cd0d0a3

Browse files
Skip functional test if Run-GHA is true (#395)
Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
1 parent 75b7339 commit cd0d0a3

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

vars/skipStage.groovy

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ boolean skip_scan_rpms(String distro, String target_branch) {
117117
boolean skip_ftest(String distro, String target_branch, String tags) {
118118
// Skip the functional vm test stage if it has already passed or
119119
// there are no tests matching the tags for the stage
120-
if (already_passed() || !testsInStage(tags)) {
120+
if (already_passed() || !testsInStage(tags) ||
121+
cachedCommitPragma('Run-GHA').toLowerCase() == 'true') {
121122
return true
122123
}
123124
// Run the functional vm test stage if explicitly requested by the user
@@ -149,7 +150,8 @@ boolean skip_ftest_valgrind(String distro, String target_branch, String tags) {
149150
return already_passed() ||
150151
!run_default_skipped_stage('func-test-vm-valgrind') ||
151152
!paramsValue('CI_FUNCTIONAL_' + distro + '_VALGRIND_TEST', false) ||
152-
skip_ftest(distro, target_branch, tags) ||
153+
(skip_ftest(distro, target_branch, tags) &&
154+
cachedCommitPragma('Run-GHA').toLowerCase() != 'true') ||
153155
/* groovylint-disable-next-line UnnecessaryGetter */
154156
isPr() ||
155157
target_branch =~ branchTypeRE('weekly')
@@ -158,7 +160,8 @@ boolean skip_ftest_valgrind(String distro, String target_branch, String tags) {
158160
boolean skip_ftest_hw(String size, String target_branch, String tags) {
159161
// Skip the functional hardware test stage if it has already passed or
160162
// there are no tests matching the tags for the stage
161-
if (already_passed() || !testsInStage(tags)) {
163+
if (already_passed() || !testsInStage(tags) ||
164+
cachedCommitPragma('Run-GHA').toLowerCase() == 'true') {
162165
return true
163166
}
164167
// Run the functional hardware test stage if explicitly requested by the user

0 commit comments

Comments
 (0)