Skip to content

Commit e7ff642

Browse files
Improved getDependency workflow
- getDependencies.pl script run twice.Once with customUrl. If it failed, retry with 3rd party URL. Closes : #6461 Signed-off-by:Amrutha Kanhirathingal <[email protected]>
1 parent 51b7317 commit e7ff642

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

buildenv/jenkins/JenkinsfileBase

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,9 @@ def setupParallelEnv() {
219219
}
220220
if (env.BUILD_LIST == 'system') {
221221
env.LIB_DIR = env.SYSTEM_LIB_DIR
222+
sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -customUrl ${customUrl}"
222223
}
223-
sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -customUrl ${customUrl}"
224+
224225
}
225226
} catch (Exception e) {
226227
echo 'Exception: ' + e.toString()
@@ -703,14 +704,15 @@ def buildTest() {
703704
// If lib exists, SHA will be checked. Re-download if SHA does not match.
704705
timeout(time: 20, unit: 'MINUTES') {
705706
def customUrl = getCustomUrl()
707+
env.CUSTOM_URL = customUrl
706708
if (PLATFORM.contains("windows")) {
707709
env.LIB_DIR = env.LIB_DIR.replaceAll("\\\\", "/")
708710
env.SYSTEM_LIB_DIR = env.SYSTEM_LIB_DIR.replaceAll("\\\\", "/")
709711
}
710712
if (env.BUILD_LIST == 'system') {
711713
env.LIB_DIR = env.SYSTEM_LIB_DIR
714+
sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -customUrl ${customUrl}"
712715
}
713-
sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -customUrl ${customUrl}"
714716
}
715717
} catch (Exception e) {
716718
echo 'Exception: ' + e.toString()

0 commit comments

Comments
 (0)