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

Do not archive before assembly phase when internal signing (Fixes cross-compile situation) #1140

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

sxa
Copy link
Member

@sxa sxa commented Nov 12, 2024

Fixes this failure condition on windows/aarch64:

10:54:05  Skipping writing incomplete metadata for now - will be done in the assemble phase instead
[Pipeline] timeout
10:54:05  Timeout set to expire in 3 hr 0 min
[Pipeline] {
[Pipeline] echo
10:54:05  [INFO] Archiving JSON Files...
[Pipeline] archiveArtifacts
10:54:05  Archiving artifacts
10:54:13  ‘workspace/target/*.json’ doesn’t match anything: ‘workspace’ exists but not ‘workspace/target/*.json’

Introduced by the refactor at #1117

@sxa sxa added the buildbreak High priority issues that cause build breaks in jenkins or build scripts label Nov 12, 2024
@sxa sxa requested a review from andrew-m-leonard November 12, 2024 12:11
@sxa sxa self-assigned this Nov 12, 2024
Copy link

Thank you for creating a pull request!

Please check out the information below if you have not made a pull request here before (or if you need a reminder how things work).

Code Quality and Contributing Guidelines

If you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before.

Tests

Github actions will run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

In order to run the advanced pipeline tests (executing a set of mock pipelines), it requires an admin to post run tests on this PR.
If you are not an admin, please ask for one's attention in #infrastructure on Slack or ping one here.
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,21"

@sxa
Copy link
Member Author

sxa commented Nov 12, 2024

run tests

@sxa
Copy link
Member Author

sxa commented Nov 12, 2024

My latest tests have managed to run through correctly although tripped up on the build process creating the top level directory in the zip file consistent with the latest tag in the repository even if you're building a different (earlier) tag, which means it's inconsistent and causes the installer code to fail:

Build log

12:14:24  checkoutRequiredCodeToBuild:
12:14:24    workspace = /cygdrive/c/workspace/openjdk-build/workspace/./build//src
12:14:24    BUILD_VARIANT = temurin
12:14:24    TAG = 
12:14:24    BRANCH = jdk-21.0.5+8_adopt
12:14:25  looks like the scm ref given is a valid tag, so treat it as a tag
12:14:25  Checking out tag jdk-21.0.5+8_adopt
12:14:38  HEAD is now at dd3ca5bf392 Merging jdk-21.0.5+8 into release
12:14:40  HEAD is now at dd3ca5bf392 Merging jdk-21.0.5+8 into release
12:14:40  Checked out tag jdk-21.0.5+8_adopt
12:14:40  SUCCESS: BUILD_CONFIG[TAG] is set. Exporting to /cygdrive/c/workspace/openjdk-build/workspace/target//metadata/scmref.txt...
12:14:40  jdk-21.0.5+8_adoptcheckoutRequiredCodeToBuild succeeded
[...]
12:53:30  OpenJDK repo tag is jdk-21.0.6+2
[...]
13:48:57  Currently at '/cygdrive/c/workspace/openjdk-build/workspace/build/src/build/windows-aarch64-server-release/images'
13:48:58  moving jdk to jdk-21.0.6+2
13:48:58  moving jre to jdk-21.0.6+2-jre
13:48:58  moving test to jdk-21.0.6+2-test-image
13:48:58  /cygdrive/c/workspace/openjdk-build/workspace/build/src/build/windows-aarch64-server-release/images/static-libs /cygdrive/c/workspace/openjdk-build/workspace/build/src/build/windows-aarch64-server-release/images

create_installer_windows log:

Job link

looking for .\SourceDir\OpenJDK-Latest\hotspot\arm64\jdk-21.0.5+8
SOURCE Dir not found / failed
Listing directory :
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot\arm64
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot\arm64\jdk-21.0.6+2
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot\arm64\jdk-21.0.6+2\bin
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot\arm64\jdk-21.0.6+2\conf
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot\arm64\jdk-21.0.6+2\include
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot\arm64\jdk-21.0.6+2\jmods
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot\arm64\jdk-21.0.6+2\legal
c:\workspace\workspace\build-scripts\release\create_installer_windows\wix\SourceDir\OpenJDK21\hotspot\arm64\jdk-21.0.6+2\lib

Because of this it will take some time to retest with the new tags specified (the jobs take about two hours and are queued up behind the PR tester ones) but since it got through the assemble phase I'm confident that this has resolved the issue so if the PR tester shows no obvious problems I think this will be good to merge.

@sxa sxa force-pushed the fix_cross_archiving branch from e54197b to e1d0223 Compare November 12, 2024 17:07
@eclipse-temurin-bot
Copy link
Collaborator

 PR TESTER RESULT 

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

@sxa
Copy link
Member Author

sxa commented Nov 12, 2024

run tests

@eclipse-temurin-bot
Copy link
Collaborator

 PR TESTER RESULT 

✅ All pipelines passed! ✅

@sxa sxa force-pushed the fix_cross_archiving branch 4 times, most recently from 861df11 to b2aa191 Compare November 13, 2024 12:06
…ss-compile situation)

Signed-off-by: Stewart X Addison <[email protected]>
@sxa sxa force-pushed the fix_cross_archiving branch from b2aa191 to 0386ad1 Compare November 13, 2024 12:32
@sxa
Copy link
Member Author

sxa commented Nov 13, 2024

Note to reviewers:

  • Suggest reviewing with whitespace ignored: https://github.com/adoptium/ci-jenkins-pipelines/pull/1140/files?diff=split&w=1
  • Ref the "this is not strictly requird" comment I've left that condition in because the same code is used elsewhere in the file and I'd rather they didn't diverge (an alternate solution would be to move it into a separate function and if that is desired I suggest raising another issue as I really want this tested version in before the EA pipelines kick off tonight)

Copy link
Contributor

@adamfarley adamfarley left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

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

looks good

@sxa
Copy link
Member Author

sxa commented Nov 13, 2024

I had one failure in one of my tests where the windows/aarch64 machine failed to talk to github during the "cross-compiled-version-out" job but that is assumed to be independent of this PR, so merging so that it can be used during the EA builds tonight.

@sxa sxa merged commit 5078087 into adoptium:master Nov 13, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
aarch buildbreak High priority issues that cause build breaks in jenkins or build scripts cross-compile jenkins-pipeline windows
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants