-
-
Notifications
You must be signed in to change notification settings - Fork 102
Improved getDependency workflow #758
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
base: master
Are you sure you want to change the base?
Improved getDependency workflow #758
Conversation
|
Logs :
https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/55715/console
https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/55707/consoleFull
|
|
I do not see that a
Only ran one test. It did not run entire sanity.functional. |
0f6efab to
f6657cc
Compare
|
Hi @llxia , As per discussion i have updated the script to consider non-system tests as well, special function : https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/55803/ Thanks |
scripts/getDependencies.pl
Outdated
| catch { | ||
| print "Warning : Download failed for $fn from custom url $url: $_"; | ||
| }; | ||
| if (!$download_success && $url ne "") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why we need to check $url here?
scripts/getDependencies.pl
Outdated
| my $full_dir_path = File::Spec->catdir($path, $dir); | ||
| my $url_custom = $customUrl; | ||
|
|
||
| my $thirdParty_Url = $url; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can use camel case or _, but do not mix them. In this case, call it third_party_url
scripts/getDependencies.pl
Outdated
| $download_success = 1; | ||
| } | ||
| catch { | ||
| print "Error: Failed to download $fn from third-party URL ($thirdParty_Url): $_"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the second download failed, the program should exit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure
scripts/getDependencies.pl
Outdated
| unless ($download_success) { | ||
| print " ERROR: Could not download $fn from either custom or third-party URL.\n"; | ||
| next; | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be removed.
|
Please also run extended.functional. Since we are using a new library |
f6657cc to
672883a
Compare
|
Extended.functional : https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/55868/ Logs : |
dac6954 to
1163234
Compare
scripts/getDependencies.pl
Outdated
| $download_success = 1; | ||
| }; | ||
| if (!$download_success) { | ||
| print "Warning: Download failed for $fn from custom URL $url\nDownloading $fn from third-party URL: $third_party_url\n"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use $filename, not $fn
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
scripts/getDependencies.pl
Outdated
| $download_success = 1; | ||
| }; | ||
| if (!$download_success) { | ||
| print "Error: Failed to download $fn from third-party URL $third_party_url\n"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use $filename, not $fn
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
1163234 to
214c065
Compare
| use File::Copy; | ||
| use File::Spec; | ||
| use File::Path qw(make_path); | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can keep this blank line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Deleted blank lines added back
214c065 to
c8dde07
Compare
|
Could you fix |
- getDependencies.pl script run twice.Once with customUrl. If it failed, retry with 3rd party URL. Closes: adoptium/aqa-tests#6461 Signed-off-by:Amrutha Kanhirathingal <Amrutha.Kanhirathingal@ibm.com>
c8dde07 to
3833722
Compare
LongyuZhang
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
tested in parallel: extended.functional and sanity.functional @Amrutha-Kanhirathingal, please fix failed cases in sanity.functional. |
|
@llxia |
|
This PR should run on the master branch (not the release branch) to ensure all dependent tests are updated accordingly. |
|
@Amrutha-Kanhirathingal, |
|
|
||
| # define directory path separator | ||
| my $sep = File::Spec->catfile('', ''); | ||
| $customUrl = $ENV{'CUSTOM_URL'} if !defined($customUrl) || $customUrl eq ''; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
New environment variable means local usr ( not jenkins story) has to do another export. Instead of setting in Jenkins file would it be better to set in makefile ie, evnSettings.mk or settings.mk?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes Thanks for pointing this out.
https://github.com/adoptium/aqa-tests/blob/80a0985b5df03cbd05cebe9ae4a81a6a42bb8dfd/buildenv/jenkins/JenkinsfileBase#L215-L216
This is how we are fetching and assigning customUrl.
I’ll set the defaults in the Makefile as suggested.
sanity.functional : https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/56773/console |

Uh oh!
There was an error while loading. Please reload this page.