Merge branch 'hwloc-thread-bind' of github.com:NicolasDenoyelle/dynamic_lstopo into hwloc-thread-bind

ndenoyelle · ndenoyelle · commit 35de5c603297 · 2019-06-19T10:38:35.000-05:00
diff --git a/contrib/ci.inria.fr/Jenkinsfile-basic b/contrib/ci.inria.fr/Jenkinsfile-basic
@@ -40,7 +40,7 @@ pipeline {
 						stash includes: "job-1-visualstudio.bat", name: 'script-msvc'
 					}
 					archiveArtifacts artifacts: tarballgz+","+tarballbz2+",doc/doxygen-doc/hwloc-a4.pdf", fingerprint: true, onlyIfSuccessful: true
-					deleteDir()
+					archiveArtifacts artifacts: "build/utils/hwloc/test-suite.log"
 				}
 			}
 		}
@@ -68,9 +68,9 @@ pipeline {
 									unstash 'script-unix-check'
 									sh 'chmod 755 job-1-check.sh && ./job-1-check.sh '+tarballgz
 									if (env.KEEP_WORKING_DIRECTORY != 'true')
-										deleteDir()
 								}
 							}
+							archiveArtifacts artifacts: "build/utils/hwloc/test-suite.log"
 						} else {
 							node('msvc') {
 								dir('check-msvc') {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pipeline {`
`40`	`40`	`stash includes: "job-1-visualstudio.bat", name: 'script-msvc'`
`41`	`41`	`}`
`42`	`42`	`archiveArtifacts artifacts: tarballgz+","+tarballbz2+",doc/doxygen-doc/hwloc-a4.pdf", fingerprint: true, onlyIfSuccessful: true`
`43`		`- deleteDir()`
	`43`	`+ archiveArtifacts artifacts: "build/utils/hwloc/test-suite.log"`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
`@@ -68,9 +68,9 @@ pipeline {`
`68`	`68`	`unstash 'script-unix-check'`
`69`	`69`	`sh 'chmod 755 job-1-check.sh && ./job-1-check.sh '+tarballgz`
`70`	`70`	`if (env.KEEP_WORKING_DIRECTORY != 'true')`
`71`		`- deleteDir()`
`72`	`71`	`}`
`73`	`72`	`}`
	`73`	`+ archiveArtifacts artifacts: "build/utils/hwloc/test-suite.log"`
`74`	`74`	`} else {`
`75`	`75`	`node('msvc') {`
`76`	`76`	`dir('check-msvc') {`