Merge pull request adoptium#152 from llxia/test3

Temporarily disable system tests for FIPS
AdamBrousseau · Apr 19, 2023 · 8897071 · 8897071
2 parents 14aa8d3 + d3a713c
commit 8897071
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 19 deletions.
diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -302,9 +302,6 @@ class Config11 {
                         'special.jck.fips',
                         'sanity.openjdk.fips',
                         'extended.openjdk.fips',
-                        'sanity.system.fips',
-                        'extended.system.fips',
-                        'special.system.fips',
                         'dev.jck'
                     ]
             ],

diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -279,10 +279,7 @@ class Config17 {
                                 'extended.jck.fips',
                                 'special.jck.fips',
                                 'sanity.openjdk.fips',
-                                'extended.openjdk.fips',
-                                'sanity.system.fips',
-                                'extended.system.fips',
-                                'special.system.fips'
+                                'extended.openjdk.fips'
                         ]
                 ],
                 additionalTestLabels: [

diff --git a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
@@ -61,10 +61,7 @@ class Config19 {
                                 'extended.jck.fips',
                                 'special.jck.fips',
                                 'sanity.openjdk.fips',
-                                'extended.openjdk.fips',
-                                'sanity.system.fips',
-                                'extended.system.fips',
-                                'special.system.fips'
+                                'extended.openjdk.fips'
                         ]
                 ],
                 cleanWorkspaceAfterBuild: true,

diff --git a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
@@ -57,10 +57,7 @@ class Config20 {
                                 "extended.jck.fips",
                                 "special.jck.fips",
                                 "sanity.openjdk.fips",
-                                "extended.openjdk.fips",
-                                "sanity.system.fips",
-                                "extended.system.fips",
-                                "special.system.fips"
+                                "extended.openjdk.fips"
                         ]
                 ],
                 cleanWorkspaceAfterBuild: true,

diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
@@ -53,10 +53,7 @@ class Config8 {
                                 'extended.jck.fips',
                                 'special.jck.fips',
                                 'sanity.openjdk.fips',
-                                'extended.openjdk.fips',
-                                'sanity.system.fips',
-                                'extended.system.fips',
-                                'special.system.fips'
+                                'extended.openjdk.fips'
                         ]
                 ],
                 configureArgs       : [