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

Added system test pre-stage jars #533

Merged
merged 1 commit into from
May 29, 2024

Conversation

annaibm
Copy link
Contributor

@annaibm annaibm commented Apr 18, 2024

  • Enables to avoid system test prerequisite zip file being empty.

related: adoptium/aqa-tests#4912

mauve => {
url => 'https://ci.adoptium.net/job/systemtest.getDependency/lastSuccessfulBuild/artifact/systemtest_prereqs/mauve/mauve.jar',
fname => 'mauve.jar',
sha1 => '8ed5b172be6a8885b72d0015f44e2a0b6c172d47'
Copy link
Contributor

@llxia llxia Apr 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

systemtest.getDependency builds mauve. The sha1 will be different in every build. We will need to ignore the sha1. The same as tools.

we do not need to ignore checksum for all systemtests jars

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has not been addressed.

We should not ignore checksum for all systemtests jars. It means line 329 my $ignoreChecksum = ($url =~ /systemtest.getDependency/); is wrong. Using mauve as an example, it should not have sha1. And we should update the logic to if sha1 or shaurl does not exist, ignore checksum.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@llxia I have updated the line to address the logic to if sha1 or shaurl does not exist, ignore checksum as below.
my $ignoreChecksum = (!defined $sha1 || $sha1 eq '') && (!defined $shaurl || $shaurl eq ''); .

@smlambert smlambert changed the title Added system test prestage jars Added system test pre-stage jars Apr 18, 2024
@annaibm annaibm force-pushed the prestageSystemJar branch 6 times, most recently from 30ac418 to dc21e7b Compare April 25, 2024 19:31
@annaibm annaibm force-pushed the prestageSystemJar branch 4 times, most recently from 054cf64 to 7681dcc Compare May 2, 2024 16:10
@annaibm annaibm force-pushed the prestageSystemJar branch 5 times, most recently from f046b76 to 134e3fd Compare May 24, 2024 20:36
@annaibm annaibm requested a review from llxia May 24, 2024 20:41
@llxia llxia requested a review from LongyuZhang May 27, 2024 15:47
scripts/getDependencies.pl Outdated Show resolved Hide resolved
scripts/getDependencies.pl Outdated Show resolved Hide resolved
- Enables to avoid system test prerequisite zip file being empty.

related: adoptium/aqa-tests#4912

Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
@annaibm
Copy link
Contributor Author

annaibm commented May 29, 2024

@annaibm annaibm requested a review from llxia May 29, 2024 16:32
@llxia
Copy link
Contributor

llxia commented May 29, 2024

Note: pre-stage system test jars in a separate folder are a temporary solution. Eventually, all jars will be moved into the same dir and duplicate jars will be removed. See adoptium/aqa-tests#4912 (comment)

@llxia
Copy link
Contributor

llxia commented May 29, 2024

Noticed in the job console that SysinternalsSuite.zip is downloaded at the runtimes and moved into testDependency\system_lib\windows_sysinternals. This is NOT due to this PR as SysinternalsSuite.zip is not even in the systemtest.getDependency job. However, we should handle this as well. I will open a separate issue for this.

00:08:47.503  configure-windows-sysinternals:
00:08:47.503       [echo] Executing macro download-file
00:08:47.503       [echo] File to download: https://download.sysinternals.com/files/SysinternalsSuite.zip
00:08:47.503       [echo] Destination: C:\temp\/windows_sysinternals/SysinternalsSuite.zip
00:08:47.503       [echo] Download tool: curl
00:08:47.503      [mkdir] Created dir: C:\temp\windows_sysinternals
00:08:47.503       [exec]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
00:08:47.503       [exec]                                  Dload  Upload   Total   Spent    Left  Speed
00:08:47.503       [exec] 
00:08:48.583       [exec]   0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0 95 50.7M   95 48.5M    0     0  38.7M      0  0:00:01  0:00:01 --:--:-- 39.0M100 50.7M  100 50.7M    0     0  39.3M      0  0:00:01  0:00:01 --:--:-- 39.6M
00:08:48.583      [unzip] Expanding: C:\temp\windows_sysinternals\SysinternalsSuite.zip into C:\Users\jenkins\testDependency\system_lib\windows_sysinternals
00:09:12.595     [delete] Deleting directory C:\temp\windows_sysinternals

Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@annaibm annaibm marked this pull request as ready for review May 29, 2024 19:10
Copy link
Contributor

@LongyuZhang LongyuZhang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@LongyuZhang LongyuZhang merged commit b9e1d27 into adoptium:master May 29, 2024
3 checks passed
@annaibm annaibm deleted the prestageSystemJar branch July 25, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants