Skip to content

Added hash for dacapo dependency.#710

Merged
llxia merged 4 commits intoadoptium:masterfrom
MattyWeee123:issue6326
Jun 13, 2025
Merged

Added hash for dacapo dependency.#710
llxia merged 4 commits intoadoptium:masterfrom
MattyWeee123:issue6326

Conversation

@MattyWeee123
Copy link
Copy Markdown
Contributor

@MattyWeee123 MattyWeee123 commented Jun 13, 2025

Created new element in 'my %base' for
dacapo-23.11-MR2-chopin-minimal.zip with hash
defined by zip download url, downloaded zip name,
and sha1 value of the downloaded zip.

Fixes: adoptium/aqa-tests#6326

Created new element in 'my %base' for
dacapo-23.11-MR2-chopin-minimal.zip with hash
defined by zip download url, downloaded zip name,
and sha1 value of the downloaded zip.

Fixes: #6326

Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
@MattyWeee123 MattyWeee123 marked this pull request as ready for review June 13, 2025 01:01
@llxia
Copy link
Copy Markdown
Contributor

llxia commented Jun 13, 2025

In PR description/commit message, you can reference the aqa-test repo issue. For example,

Fixes: adoptium/aqa-tests#6326

Changed the hash filename for dacapo from
dacapo-23.11-MR2-chopin-minimal.zip to dacapo.zip.

Fixes: adoptium/aqa-tests#6326

Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
Local indentation looked different from remote
indentation due to VSCode settings. This should
fix it.

Fixes: adoptium/aqa-tests#6326

Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
Nevermind, spaces was not the issue. Might have
had whitespace characters that I didn't see.

Fixes: adoptium/aqa-tests#6326

Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
@llxia llxia merged commit 2913bf6 into adoptium:master Jun 13, 2025
3 checks passed
@llxia
Copy link
Copy Markdown
Contributor

llxia commented Jun 13, 2025

https://openj9-jenkins.osuosl.org/job/test.getDependency/ has been broken since Jun 6th.

Issue opened at adoptium/aqa-tests#6336

@MattyWeee123 MattyWeee123 deleted the issue6326 branch June 14, 2025 02:02
@llxia
Copy link
Copy Markdown
Contributor

llxia commented Jun 16, 2025

https://ci.adoptium.net/job/test.getDependency/2507/console failed with the dacapo SHA. @MattyWeee123 could you take a look? Thanks

downloading https://download.dacapobench.org/chopin/dacapo-23.11-MR2-chopin-minimal.zip
ERROR: sha checksum error.
--> file downloaded to ./dacapo.zip
Expected sha is: 2dd4704900e43f4e22c70255b555c02177ef07c4,
Actual sha is  : da39a3ee5e6b4b0d3255bfef95601890afd80709.

@MattyWeee123
Copy link
Copy Markdown
Contributor Author

image

In buildenv/Jenkins/getDependency,

the perl command should include a redirect flag -L, since the link in the getDependencies.pl is not a destination link. I accounted for this in dacapo/build.xml for adoptium/aqa-tests/#6326. Is there a reason why we do not use -L? The original example code for adoptium/aqa-tests/#6326 also assumed no need for -L.

@llxia
Copy link
Copy Markdown
Contributor

llxia commented Jun 16, 2025

We never had to use -L before. If we want to add -L as a default, I would suggest setting a max-redirs (i.e., -L --max-redirs 5 ). You can set via curlOpts in the following
https://github.com/search?q=repo%3Aadoptium%2Faqa-tests%20getDependencies.pl&type=code

Update: On second thought, let's try updating dacapo url only. Change https://github.com/MattyWeee123/TKG/blob/67d2cec326c46e42f7d3f1705249846f48a04f0f/scripts/getDependencies.pl#L207
to url => ' -L https://download.dacapobench.org/chopin/dacapo-23.11-MR2-chopin-minimal.zip',

MattyWeee123 added a commit to MattyWeee123/TKG that referenced this pull request Jun 17, 2025
Fixes: adoptium#710

Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
MattyWeee123 added a commit to MattyWeee123/TKG that referenced this pull request Jun 17, 2025
Fixes: adoptium#710

Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
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.

Leverage getDependencies for dacapo.zip

3 participants