Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAOS-15150 test: To implement bullseye_generate_report and fix error #423

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c9a8d13
DAOS-15116 test: fix missing test.cov file on functional VM, HW and u…
dinghwah Feb 2, 2024
2aa7f40
DAOS-15116 test: fix missing test.cov file and unit-test
dinghwah Feb 2, 2024
68e56f9
Recommit
dinghwah Feb 3, 2024
f81fca1
DAOS-15150 test: To implement bullseye_generate_report and fix error
dinghwah Feb 27, 2024
3fa9994
Merge branch 'master' of https://github.com/daos-stack/pipeline-lib
dinghwah Feb 28, 2024
cdfbf18
Merge branch 'master' into dinghwah/DAOS-15116-BtestPipeline
dinghwah Feb 28, 2024
b3d803a
Recommit
dinghwah Feb 28, 2024
060f624
Update functionalTest.groovy with get bullseye.tar
dinghwah Mar 11, 2024
c906b9f
Merge branch 'master' of https://github.com/daos-stack/pipeline-lib
dinghwah Mar 12, 2024
dfe6d5f
Merge branch 'master' into dinghwah/DAOS-15116-BtestPipeline
dinghwah Mar 12, 2024
c6fbd7f
Merge branch 'master' of https://github.com/daos-stack/pipeline-lib
dinghwah Mar 12, 2024
4b33701
Merge branch 'master' into dinghwah/DAOS-15116-BtestPipeline
dinghwah Mar 12, 2024
95eb6ed
Update functionalTest.groovy per Phil's comment.
dinghwah Mar 13, 2024
f742933
Add configureBullseye.groovy script.
phender Mar 14, 2024
f578418
Merge branch 'dinghwah/DAOS-15116-BtestPipeline' of https://github.co…
phender Mar 14, 2024
73e9e25
Fix merge.
phender Mar 14, 2024
10a82a3
Fixing bullseye install.
phender Mar 15, 2024
9d707f9
Only download the bullseye file in pipeline-lib.
phender Mar 20, 2024
0264dcb
Merge branch 'master' into dinghwah/DAOS-15116-BtestPipeline
phender Mar 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions vars/downloadBullseye.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// vars/downloadBullseye.groovy

/**
* downloadBullseye.groovy
*
* Download bullseye.
*
*/
void call() {
echo "[${env.STAGE_NAME}] Downloading bullseye"
String tools_url = "${env.JENKINS_URL}job/daos-stack/job/tools/job/master/lastSuccessfulBuild"
String bullseye_url = "${tools_url}/artifact/bullseyecoverage-linux.tar"
httpRequest url: bullseye_url, httpMode: 'GET', outputFile: 'bullseye.tar'
}
4 changes: 4 additions & 0 deletions vars/functionalTest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ Map call(Map config = [:]) {
error.getMessage())
}

if (env.BULLSEYE) {
downloadBullseye()
}

Map runtestData = [:]
if (config.get('test_function', 'runTestFunctional') ==
'runTestFunctionalV2') {
Expand Down
27 changes: 19 additions & 8 deletions vars/runTestFunctionalV2.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,25 @@ Map call(Map config = [:]) {
// Restore the ignore failure setting
config['ignore_failure'] = ignore_failure

String covfile = 'test.cov'
if (!fileExists('test.cov')) {
covfile += '_not_done'
fileOperations([fileCreateOperation(fileName: covfile,
fileContent: '')])
if (fileExists("${basedir}bullseye_coverage_logs/test.cov")) {
String name = 'func' + stage_info['pragma_suffix'] + '-cov'
println("[${env.STAGE_NAME}] Stashing ${basedir}bullseye_coverage_logs/test.cov in ${name}")
dir("${basedir}bullseye_coverage_logs") {
stash name: config.get('coverage_stash', name),
includes: 'test.cov'
}
} else {
println("[${env.STAGE_NAME}] No ${basedir}bullseye_coverage_logs/test.cov file found!")
}
String name = 'func' + stage_info['pragma_suffix'] + '-cov'
stash name: config.get('coverage_stash', name),
includes: covfile

// String covfile = 'test.cov'
// if (!fileExists('test.cov')) {
// covfile += '_not_done'
// fileOperations([fileCreateOperation(fileName: covfile,
// fileContent: '')])
// }
// String name = 'func' + stage_info['pragma_suffix'] + '-cov'
// stash name: config.get('coverage_stash', name),
// includes: covfile
return runData
}
7 changes: 1 addition & 6 deletions vars/sconsBuild.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,7 @@ Map call(Map config = [:]) {
}

if (stage_info['compiler'] == 'covc') {
httpRequest url: env.JENKINS_URL +
'job/daos-stack/job/tools/job/master' +
'/lastSuccessfulBuild/artifact/' +
'bullseyecoverage-linux.tar',
httpMode: 'GET',
outputFile: 'bullseye.tar'
downloadBullseye()
}

def set_cwd = ''
Expand Down
7 changes: 1 addition & 6 deletions vars/unitTest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,7 @@ Map call(Map config = [:]) {
}

if (stage_info['compiler'] == 'covc') {
String tools_url = env.JENKINS_URL +
'job/daos-stack/job/tools/job/master' +
'/lastSuccessfulBuild/artifact/'
httpRequest url: tools_url + 'bullseyecoverage-linux.tar',
httpMode: 'GET',
outputFile: 'bullseye.tar'
downloadBullseye()
}

String with_valgrind = stage_info.get('with_valgrind', '')
Expand Down