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

Jump to bottom

Update Matrix Security syntax Because of Plugin upgrade #957

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Update Matrix Security syntax Because of Plugin upgrade #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce9a662
migrate to new matrix security plugin syntax, leave old syntax commen…
karianna Mar 5, 2024
0c21b95
Add commas to separate elements in the array because Groovy
karianna Mar 5, 2024
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
68 changes: 60 additions & 8 deletions pipelines/build/common/create_job_from_template.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,68 @@ pipelineJob("$buildFolder/$JOB_NAME") {
// Do not inherit permissions from global configuration
nonInheriting()
}
permissions(['GROUP:hudson.model.Item.Build:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build-triage',

entries {
group {
name('AdoptOpenJDK*build')
permissions(
[
'Job/Build', // 'hudson.model.Item.Build'
'Job/Cancel', // 'hudson.model.Item.Cancel'
'Job/Configure', // 'hudson.model.Item.Configure'
'Job/Read', // 'hudson.model.Item.Read'
'Job/Workspace', // 'hudson.model.Item.Workspace'
'Run/Update' // 'hudson.model.Run.Update'
])

}
group {
name('AdoptOpenJDK*build-triage')
permissions(
[
'Job/Build', // 'hudson.model.Item.Build'
'Job/Cancel', // 'hudson.model.Item.Cancel'
'Job/Configure', // 'hudson.model.Item.Configure'
'Job/Read', // 'hudson.model.Item.Read'
'Job/Workspace', // 'hudson.model.Item.Workspace'
'Run/Update' // 'hudson.model.Run.Update'
])
}
// eclipse-temurin-bot needs read access for TRSS
user {
name('eclipse-temurin-bot')
permissions(
[
'Job/Read' // 'hudson.model.Item.Read'
])
}
// eclipse-temurin-compliance bot needs read access for https://ci.eclipse.org/temurin-compliance for copying artifacts
user {
name('eclipse-temurin-compliance-bot')
permissions(
[
'Job/Read' // 'hudson.model.Item.Read'
])
}
}

//permissions([
//'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build-triage', MIGRATED
// eclipse-temurin-bot needs read access for TRSS
'USER:hudson.model.Item.Read:eclipse-temurin-bot',
//'USER:hudson.model.Item.Read:eclipse-temurin-bot', MIGRATED
// eclipse-temurin-compliance bot needs read access for https://ci.eclipse.org/temurin-compliance
'USER:hudson.model.Item.Read:eclipse-temurin-compliance-bot',
'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build', 'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build-triage'])
//'USER:hudson.model.Item.Read:eclipse-temurin-compliance-bot', MIGRATED
//'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build-triage']) MIGRATED
}
}
disableConcurrentBuilds()
Expand Down
68 changes: 60 additions & 8 deletions pipelines/jobs/pipeline_job_template.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,68 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") {
// Do not inherit permissions from global configuration
nonInheriting()
}
permissions(['GROUP:hudson.model.Item.Build:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build-triage',

entries {
group {
name('AdoptOpenJDK*build')
permissions(
[
'Job/Build', // 'hudson.model.Item.Build'
'Job/Cancel', // 'hudson.model.Item.Cancel'
'Job/Configure', // 'hudson.model.Item.Configure'
'Job/Read', // 'hudson.model.Item.Read'
'Job/Workspace', // 'hudson.model.Item.Workspace'
'Run/Update' // 'hudson.model.Run.Update'
])

}
group {
name('AdoptOpenJDK*build-triage')
permissions(
[
'Job/Build', // 'hudson.model.Item.Build'
'Job/Cancel', // 'hudson.model.Item.Cancel'
'Job/Configure', // 'hudson.model.Item.Configure'
'Job/Read', // 'hudson.model.Item.Read'
'Job/Workspace', // 'hudson.model.Item.Workspace'
'Run/Update' // 'hudson.model.Run.Update'
])
}
// eclipse-temurin-bot needs read access for TRSS
user {
name('eclipse-temurin-bot')
permissions(
[
'Job/Read' // 'hudson.model.Item.Read'
])
}
// eclipse-temurin-compliance bot needs read access for https://ci.eclipse.org/temurin-compliance for copying artifacts
user {
name('eclipse-temurin-compliance-bot')
permissions(
[
'Job/Read' // 'hudson.model.Item.Read'
])
}
}

//permissions([
//'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build-triage', MIGRATED
// eclipse-temurin-bot needs read access for TRSS
'USER:hudson.model.Item.Read:eclipse-temurin-bot',
//'USER:hudson.model.Item.Read:eclipse-temurin-bot', MIGRATED
// eclipse-temurin-compliance bot needs read access for https://ci.eclipse.org/temurin-compliance
'USER:hudson.model.Item.Read:eclipse-temurin-compliance-bot',
'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build', 'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build-triage'])
//'USER:hudson.model.Item.Read:eclipse-temurin-compliance-bot', MIGRATED
//'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build-triage']) MIGRATED
}
}
pipelineTriggers {
Expand Down
72 changes: 62 additions & 10 deletions pipelines/jobs/release_pipeline_job_template.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,68 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") {
// Do not inherit permissions from global configuration
nonInheriting()
}
permissions(['GROUP:hudson.model.Item.Build:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build-triage',
// eclipse-temurin-bot needs read access for TRSS
'USER:hudson.model.Item.Read:eclipse-temurin-bot',
// eclipse-temurin-compliance bot needs read access for https://ci.eclipse.org/temurin-compliance
'USER:hudson.model.Item.Read:eclipse-temurin-compliance-bot',
'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build', 'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build-triage',
'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build', 'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build-triage'])

entries {
group {
name('AdoptOpenJDK*build')
permissions(
[
'Job/Build', // 'hudson.model.Item.Build'
'Job/Cancel', // 'hudson.model.Item.Cancel'
'Job/Configure', // 'hudson.model.Item.Configure'
'Job/Read', // 'hudson.model.Item.Read'
'Job/Workspace', // 'hudson.model.Item.Workspace'
'Run/Update' // 'hudson.model.Run.Update'
])

}
group {
name('AdoptOpenJDK*build-triage')
permissions(
[
'Job/Build', // 'hudson.model.Item.Build'
'Job/Cancel', // 'hudson.model.Item.Cancel'
'Job/Configure', // 'hudson.model.Item.Configure'
'Job/Read', // 'hudson.model.Item.Read'
'Job/Workspace', // 'hudson.model.Item.Workspace'
'Run/Update' // 'hudson.model.Run.Update'
])
}
// eclipse-temurin-bot needs read access for TRSS
user {
name('eclipse-temurin-bot')
permissions(
[
'Job/Read' // 'hudson.model.Item.Read'
])
}
// eclipse-temurin-compliance bot needs read access for https://ci.eclipse.org/temurin-compliance for copying artifacts
user {
name('eclipse-temurin-compliance-bot')
permissions(
[
'Job/Read' // 'hudson.model.Item.Read'
])
}

//permissions([
//'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Build:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Cancel:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Configure:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Read:AdoptOpenJDK*build-triage', MIGRATED
// eclipse-temurin-bot needs read access for TRSS
//'USER:hudson.model.Item.Read:eclipse-temurin-bot', MIGRATED
// eclipse-temurin-compliance bot needs read access for https://ci.eclipse.org/temurin-compliance
//'USER:hudson.model.Item.Read:eclipse-temurin-compliance-bot', MIGRATED
//'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Item.Workspace:AdoptOpenJDK*build-triage', MIGRATED
//'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build', MIGRATED
//'GROUP:hudson.model.Run.Update:AdoptOpenJDK*build-triage']) MIGRATED
}
}
copyArtifactPermission {
projectNames('*')
Expand Down
Loading