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.

Sign up for GitHub

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

sign node label #467

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

sign node label #467

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88f6531
fixed the "build all pass" typo to "builds all pass"
cornelia247 Oct 12, 2022
b21c986
parementalised Sign_node
cornelia247 Oct 13, 2022
f9c17d7
Merge branch 'adoptium:master' into signBuild
cornelia247 Oct 13, 2022
90d6e87
Update pipelines/defaults.json
cornelia247 Oct 13, 2022
92bb465
fixed README.md issue
cornelia247 Oct 13, 2022
d4c685a
Merge branch 'signBuild' of https://github.com/cornelia247/ci-jenkins…
cornelia247 Oct 13, 2022
d6904bb
Merge branch 'adoptium:master' into signBuild
cornelia247 Oct 13, 2022
2fbe888
removed space
cornelia247 Oct 13, 2022
99af379
Merge branch 'signBuild' of https://github.com/cornelia247/ci-jenkins…
cornelia247 Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ class Build {
Run the Sign downstream job. We run this job on windows and jdk8 hotspot & jdk13 mac builds.
The job code signs and notarizes the binaries so they can run on these operating systems without encountering issues.
*/
def SIGN_NODE_LABEL = DEFAULTS_JSON['signNodeLabel']
Copy link
Contributor

@sophia-guo sophia-guo Oct 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

It is better to move this definition to the function build() to be visible to sign(), signInstaller() and probably other functions.

def sign(VersionInfo versionInfo) {
// Sign and archive jobs if needed
if (
Expand All @@ -493,7 +494,8 @@ class Build {
context.stage('sign') {
def filter = ''

def nodeFilter = 'eclipse-codesign'
def nodeFilter = "${SIGN_NODE_LABEL}"


if (buildConfig.TARGET_OS == 'windows') {
filter = '**/OpenJDK*_windows_*.zip'
Expand Down Expand Up @@ -701,7 +703,8 @@ class Build {
default: break
}

def nodeFilter = 'eclipse-codesign'
/* groovylint-disable-next-line VariableTypeRequired */
def nodeFilter = "${SIGN_NODE_LABEL}"
Comment on lines +706 to +707
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/* groovylint-disable-next-line VariableTypeRequired */
def nodeFilter = "${SIGN_NODE_LABEL}"
String nodeFilter = "${SIGN_NODE_LABEL}"


// Execute sign installer job
def installerJob = context.build job: 'build-scripts/release/sign_installer',
Expand Down
3 changes: 2 additions & 1 deletion pipelines/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@
"numMachines" : ["3"]
}
},
"defaultsUrl" : "https://raw.githubusercontent.com/adoptium/ci-jenkins-pipelines/master/pipelines/defaults.json"
"defaultsUrl" : "https://raw.githubusercontent.com/adoptium/ci-jenkins-pipelines/master/pipelines/defaults.json",
"signNodeLabel" : "eclipse-codesign"
cornelia247 marked this conversation as resolved.
Show resolved Hide resolved
karianna marked this conversation as resolved.
Show resolved Hide resolved
}