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 FIPS to FIPS140-2 #174

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Update FIPS to FIPS140-2 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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 @@ -381,8 +381,8 @@ class Build {
context.stage("${testType}") {
def isFipsTestBuild = false
def rerunIterations = '3'
if ("${testType}".contains(".fips")) {
testType = testType.replace(".fips","")
if ("${testType}".contains(".fips140_2")) {
testType = testType.replace(".fips140_2","")
isFipsTestBuild = true
rerunIterations = '0'
}
Expand Down Expand Up @@ -448,8 +448,8 @@ class Build {

def testFlag = ''
if (isFipsTestBuild) {
jobParams.put('TEST_JOB_NAME', "${jobParams.TEST_JOB_NAME}_fips")
testFlag = 'FIPS'
jobParams.put('TEST_JOB_NAME', "${jobParams.TEST_JOB_NAME}_fips140_2")
testFlag = 'FIPS140_2'
}
def parallel = 'None'
def numMachinesPerTest = ''
Expand Down
18 changes: 7 additions & 11 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,17 +294,13 @@ class Config11 {
'special.functional',
'special.jck',
'sanity.external',
'sanity.functional.fips',
'extended.functional.fips',
'special.functional.fips',
'sanity.jck.fips',
'extended.jck.fips',
'special.jck.fips',
'sanity.openjdk.fips',
'extended.openjdk.fips',
'sanity.system.fips',
'extended.system.fips',
'special.system.fips',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'dev.jck'
]
],
Expand Down
18 changes: 7 additions & 11 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,17 +274,13 @@ class Config17 {
'special.functional',
'special.jck',
'sanity.external',
'sanity.functional.fips',
'extended.functional.fips',
'special.functional.fips',
'sanity.jck.fips',
'extended.jck.fips',
'special.jck.fips',
'sanity.openjdk.fips',
'extended.openjdk.fips',
'sanity.system.fips',
'extended.system.fips',
'special.system.fips'
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
]
],
additionalTestLabels: [
Expand Down
15 changes: 7 additions & 8 deletions pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,13 @@ class Config19 {
'special.functional',
'special.jck',
'sanity.external',
'sanity.functional.fips',
'extended.functional.fips',
'special.functional.fips',
'sanity.jck.fips',
'extended.jck.fips',
'special.jck.fips',
'sanity.openjdk.fips',
'extended.openjdk.fips'
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
]
],
cleanWorkspaceAfterBuild: true,
Expand Down
15 changes: 7 additions & 8 deletions pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@ class Config20 {
"special.functional",
"special.jck",
"sanity.external",
"sanity.functional.fips",
"extended.functional.fips",
"special.functional.fips",
"sanity.jck.fips",
"extended.jck.fips",
"special.jck.fips",
"sanity.openjdk.fips",
"extended.openjdk.fips"
"sanity.functional.fips140_2",
"extended.functional.fips140_2",
"sanity.jck.fips140_2",
"extended.jck.fips140_2",
"special.jck.fips140_2",
"sanity.openjdk.fips140_2",
"extended.openjdk.fips140_2"
]
],
cleanWorkspaceAfterBuild: true,
Expand Down
15 changes: 7 additions & 8 deletions pipelines/jobs/configurations/jdk21_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,13 @@ class Config21 {
"special.functional",
"special.jck",
"sanity.external",
"sanity.functional.fips",
"extended.functional.fips",
"special.functional.fips",
"sanity.jck.fips",
"extended.jck.fips",
"special.jck.fips",
"sanity.openjdk.fips",
"extended.openjdk.fips"
"sanity.functional.fips140_2",
"extended.functional.fips140_2",
"sanity.jck.fips140_2",
"extended.jck.fips140_2",
"special.jck.fips140_2",
"sanity.openjdk.fips140_2",
"extended.openjdk.fips140_2"
]
],
cleanWorkspaceAfterBuild: true,
Expand Down
18 changes: 7 additions & 11 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,13 @@ class Config8 {
'special.functional',
'special.jck',
'sanity.external',
'sanity.functional.fips',
'extended.functional.fips',
'special.functional.fips',
'sanity.jck.fips',
'extended.jck.fips',
'special.jck.fips',
'sanity.openjdk.fips',
'extended.openjdk.fips',
'sanity.system.fips',
'extended.system.fips',
'special.system.fips'
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
]
],
configureArgs : [
Expand Down