Fix: Flaky Workflow Test cross polluted by SystemResource test (#25789)

Author: yan-3005

openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/SystemResourceIT.java

@@ -1027,6 +1027,21 @@ void test_assetCertificationSettings() throws Exception {
 
     assertEquals("NewCertification", updatedCertificationConfig.getAllowedClassification());
     assertEquals("P60D", updatedCertificationConfig.getValidityPeriod());
+
+    // Reset to original values to avoid cross-test pollution
+    certificationConfig.setAllowedClassification("Certification");
+    certificationConfig.setValidityPeriod("P30D");
+
+    Settings resetSettings =
+        new Settings()
+            .withConfigType(SettingsType.ASSET_CERTIFICATION_SETTINGS)
+            .withConfigValue(certificationConfig);
+
+    String resetJson = MAPPER.writeValueAsString(resetSettings);
+    client
+        .getHttpClient()
+        .executeForString(
+            HttpMethod.PUT, "/v1/system/settings", resetJson, RequestOptions.builder().build());
   }
 
   @Test

openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/WorkflowDefinitionResourceIT.java

@@ -57,6 +57,7 @@
 import org.openmetadata.schema.api.teams.CreateUser;
 import org.openmetadata.schema.api.tests.CreateTestCase;
 import org.openmetadata.schema.api.tests.CreateTestDefinition;
+import org.openmetadata.schema.configuration.AssetCertificationSettings;
 import org.openmetadata.schema.entity.classification.Classification;
 import org.openmetadata.schema.entity.classification.Tag;
 import org.openmetadata.schema.entity.data.APICollection;
@@ -82,6 +83,8 @@
 import org.openmetadata.schema.services.connections.database.MysqlConnection;
 import org.openmetadata.schema.services.connections.database.PostgresConnection;
 import org.openmetadata.schema.services.connections.database.common.basicAuth;
+import org.openmetadata.schema.settings.Settings;
+import org.openmetadata.schema.settings.SettingsType;
 import org.openmetadata.schema.tests.TestCase;
 import org.openmetadata.schema.tests.TestPlatform;
 import org.openmetadata.schema.type.APIRequestMethod;
@@ -5880,6 +5883,24 @@ private void setupCertificationTags_SDK() {
       }
     }
 
+    // Ensure Gold tag exists (bootstrapped at startup, but ensure defensively)
+    try {
+      Tag goldTag = SdkClients.adminClient().tags().getByName("Certification.Gold");
+      LOG.debug("Gold tag already exists: {}", goldTag.getFullyQualifiedName());
+    } catch (ApiException e) {
+      if (e.getStatusCode() == 404) {
+        CreateTag createGoldTag =
+            new CreateTag()
+                .withName("Gold")
+                .withDescription("Gold certified Data Asset.")
+                .withClassification("Certification");
+        Tag goldTag = SdkClients.adminClient().tags().create(createGoldTag);
+        LOG.debug("Gold tag created: {}", goldTag.getFullyQualifiedName());
+      } else {
+        throw e;
+      }
+    }
+
     // Check if Brass tag already exists
     try {
       Tag brassTag = SdkClients.adminClient().tags().getByName("Certification.Brass");
@@ -5898,6 +5919,31 @@ private void setupCertificationTags_SDK() {
         throw e;
       }
     }
+
+    // Defensively ensure AssetCertificationSettings has correct allowedClassification.
+    // This guards against cross-test pollution (e.g., SystemResourceIT changing it).
+    try {
+      OpenMetadataClient client = SdkClients.adminClient();
+      AssetCertificationSettings certSettings =
+          new AssetCertificationSettings()
+              .withAllowedClassification("Certification")
+              .withValidityPeriod("P30D");
+      Settings settings =
+          new Settings()
+              .withConfigType(SettingsType.ASSET_CERTIFICATION_SETTINGS)
+              .withConfigValue(certSettings);
+      String settingsJson = MAPPER.writeValueAsString(settings);
+      client
+          .getHttpClient()
+          .executeForString(
+              HttpMethod.PUT,
+              "/v1/system/settings",
+              settingsJson,
+              RequestOptions.builder().build());
+      LOG.debug("AssetCertificationSettings reset to allowedClassification=Certification");
+    } catch (Exception e) {
+      LOG.warn("Failed to reset AssetCertificationSettings: {}", e.getMessage());
+    }
   }
 
   private void createTestEntities_SDK(TestNamespace ns, TestInfo test) {