@@ -188,9 +188,9 @@ def setupParallelEnv() {
188
188
}
189
189
190
190
try {
191
- // get pre-staged jars from test.getDependency build
192
- timeout(time : 2 , unit : ' HOURS ' ) {
193
- copyArtifacts fingerprintArtifacts : true , projectName : " test.getDependency" , selector : lastSuccessful(), target : ' aqa-tests/TKG/lib'
191
+ // Only json-simple.jar is needed for compiling TKG
192
+ timeout(time : 15 , unit : ' MINUTES ' ) {
193
+ copyArtifacts fingerprintArtifacts : true , projectName : " test.getDependency" , filter : " json-simple.jar " , selector : lastSuccessful(), target : ' aqa-tests/TKG/lib'
194
194
}
195
195
} catch (Exception e) {
196
196
echo ' Exception: ' + e. toString()
@@ -624,29 +624,39 @@ def buildTest() {
624
624
625
625
try {
626
626
// get pre-staged jars from test.getDependency build before test compilation
627
- timeout(time : 2 , unit : ' HOURS ' ) {
628
- copyArtifacts fingerprintArtifacts : true , projectName : " test.getDependency" , selector : lastSuccessful(), target : ' aqa-tests/TKG/lib'
627
+ timeout(time : 15 , unit : ' MINUTES ' ) {
628
+ copyArtifacts fingerprintArtifacts : true , projectName : " test.getDependency" , filter : " json-simple.jar " , selector : lastSuccessful(), target : ' aqa-tests/TKG/lib'
629
629
}
630
- } catch (Exception e) {
631
- echo ' Exception: ' + e. toString()
632
- echo ' Cannot run copyArtifacts from test.getDependency. Skipping copyArtifacts...'
633
- }
634
-
635
- try {
636
- if (env. BUILD_LIST . startsWith(' system' )) {
630
+ if (env. BUILD_LIST . contains(' functional' )) {
631
+ timeout(time : 60 , unit : ' MINUTES' ) {
632
+ copyArtifacts fingerprintArtifacts : true , projectName : " test.getDependency" , excludes : " json-simple.jar, jtreg*.*, openj9jtregtimeouthandler.*" , selector : lastSuccessful(), target : ' aqa-tests/TKG/lib'
633
+ }
634
+ // jtreg is needed in dev.functional and extended.functional (for ssl-tests and CryptoTest)
635
+ if (params. TARGET . contains(' dev.functional' ) || params. TARGET . contains(' extended.functional' )) {
636
+ timeout(time : 60 , unit : ' MINUTES' ) {
637
+ copyArtifacts fingerprintArtifacts : true , projectName : " test.getDependency" , filter : " jtreg*.*,openj9jtregtimeouthandler.*" , selector : lastSuccessful(), target : ' aqa-tests/TKG/lib'
638
+ }
639
+ }
640
+ }
641
+ if (env. BUILD_LIST . contains(' openjdk' )) {
642
+ timeout(time : 60 , unit : ' MINUTES' ) {
643
+ copyArtifacts fingerprintArtifacts : true , projectName : " test.getDependency" , filter : " jtreg*.*,openj9jtregtimeouthandler.*" , selector : lastSuccessful(), target : ' aqa-tests/TKG/lib'
644
+ }
645
+ }
646
+ if (env. BUILD_LIST . contains(' system' )) {
637
647
// get pre-staged test jars from systemtest.getDependency build before system test compilation
638
- timeout(time : 2 , unit : ' HOURS ' ) {
648
+ timeout(time : 60 , unit : ' MINUTES ' ) {
639
649
copyArtifacts fingerprintArtifacts : true , projectName : " systemtest.getDependency" , selector : lastSuccessful(), target : ' aqa-tests'
640
650
}
641
651
}
642
652
} catch (Exception e) {
643
653
echo ' Exception: ' + e. toString()
644
- echo ' Cannot run copyArtifacts from systemtest.getDependency. Skipping copyArtifacts...'
654
+ echo ' Cannot run copyArtifacts from test.getDependency/ systemtest.getDependency. Skipping copyArtifacts...'
645
655
}
646
656
647
657
if (BUILD_LIST . contains(" external" )){
648
658
try {
649
- timeout(time : 2 , unit : ' HOURS ' ) {
659
+ timeout(time : 60 , unit : ' MINUTES ' ) {
650
660
copyArtifacts fingerprintArtifacts : true , projectName : " UploadFileOnJenkins" , selector : specific(" 2" ), target : ' aqa-tests/external/criu/'
651
661
copyArtifacts fingerprintArtifacts : true , projectName : " UploadFileOnJenkins" , selector : specific(" 3" ), target : ' aqa-tests/external/criu/'
652
662
}
0 commit comments