[issue 176] - Adding the InfinispanOperatorProvisioner to the set of …

…provisioners tested by ProvisionerCleanupTestCase (bad name for test that verifies the priovisioning lifecycle)
Intersmash · May 20, 2024 · 28c080b · 28c080b
1 parent 659010a
commit 28c080b
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 15 deletions.
diff --git a/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java
@@ -28,11 +28,14 @@
 import java.util.Map;
 
 import org.assertj.core.util.Strings;
+import org.infinispan.v1.Infinispan;
+import org.infinispan.v2alpha1.Cache;
 import org.jboss.intersmash.IntersmashConfig;
 import org.jboss.intersmash.application.openshift.BootableJarOpenShiftApplication;
 import org.jboss.intersmash.application.openshift.Eap7ImageOpenShiftApplication;
 import org.jboss.intersmash.application.openshift.Eap7LegacyS2iBuildTemplateApplication;
 import org.jboss.intersmash.application.openshift.Eap7TemplateOpenShiftApplication;
+import org.jboss.intersmash.application.openshift.InfinispanOperatorApplication;
 import org.jboss.intersmash.application.openshift.KafkaOperatorApplication;
 import org.jboss.intersmash.application.openshift.KeycloakOperatorApplication;
 import org.jboss.intersmash.application.openshift.MysqlImageOpenShiftApplication;
@@ -46,6 +49,7 @@
 import org.jboss.intersmash.application.openshift.template.Eap7Template;
 import org.jboss.intersmash.application.openshift.template.PostgreSQLTemplate;
 import org.jboss.intersmash.application.openshift.template.RhSsoTemplate;
+import org.jboss.intersmash.provision.openshift.operator.infinispan.infinispan.InfinispanBuilder;
 import org.jboss.intersmash.test.deployments.DeploymentsProvider;
 import org.jboss.intersmash.test.deployments.TestDeploymentProperties;
 import org.jboss.intersmash.test.deployments.WildflyDeploymentApplicationConfiguration;
@@ -759,4 +763,27 @@ public String getName() {
 			}
 		};
 	}
+
+	static InfinispanOperatorApplication getInfinispanOperatorApplication() {
+		return new InfinispanOperatorApplication() {
+			private static final String DEFAULT_INFINISPAN_APP_NAME = "example-infinispan";
+
+			@Override
+			public Infinispan getInfinispan() {
+				return new InfinispanBuilder(DEFAULT_INFINISPAN_APP_NAME, Map.of("app", DEFAULT_INFINISPAN_APP_NAME))
+						.replicas(1)
+						.build();
+			}
+
+			@Override
+			public List<Cache> getCaches() {
+				return Collections.emptyList();
+			}
+
+			@Override
+			public String getName() {
+				return DEFAULT_INFINISPAN_APP_NAME;
+			}
+		};
+	}
 }
diff --git a/...t/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java b/...t/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java
@@ -20,6 +20,7 @@
 
 import org.jboss.intersmash.provision.openshift.Eap7ImageOpenShiftProvisioner;
 import org.jboss.intersmash.provision.openshift.Eap7LegacyS2iBuildTemplateProvisioner;
+import org.jboss.intersmash.provision.openshift.InfinispanOperatorProvisioner;
 import org.jboss.intersmash.provision.openshift.KeycloakOperatorProvisioner;
 import org.jboss.intersmash.provision.openshift.MysqlImageOpenShiftProvisioner;
 import org.jboss.intersmash.provision.openshift.OpenShiftProvisioner;
@@ -51,29 +52,39 @@ public class ProvisionerCleanupTestCase {
 	private static Stream<OpenShiftProvisioner> provisionerProvider() {
 		if (IntersmashTestsuiteProperties.isCommunityTestExecutionProfileEnabled()) {
 			return Stream.of(
+					// WildFly
 					new WildflyBootableJarImageOpenShiftProvisioner(
-							OpenShiftProvisionerTestBase.getWildflyBootableJarOpenShiftApplication()),
-					new WildflyBootableJarImageOpenShiftProvisioner(
-							OpenShiftProvisionerTestBase.getEap7BootableJarOpenShiftApplication()),
-					new MysqlImageOpenShiftProvisioner(OpenShiftProvisionerTestBase.getMysqlOpenShiftApplication()),
-					new PostgreSQLImageOpenShiftProvisioner(
-							OpenShiftProvisionerTestBase.getPostgreSQLImageOpenShiftApplication()),
-					new PostgreSQLTemplateOpenShiftProvisioner(
-							OpenShiftProvisionerTestBase.getPostgreSQLTemplateOpenShiftApplication()),
-					new KeycloakOperatorProvisioner(
-							OpenShiftProvisionerTestBase.getKeycloakOperatorApplication()));
+							OpenShiftProvisionerTestBase.getWildflyBootableJarOpenShiftApplication())
+					, new WildflyBootableJarImageOpenShiftProvisioner(
+							OpenShiftProvisionerTestBase.getEap7BootableJarOpenShiftApplication())
+					// Keycloak
+					, new KeycloakOperatorProvisioner(
+							OpenShiftProvisionerTestBase.getKeycloakOperatorApplication())
+					// Infinispan
+					, new InfinispanOperatorProvisioner(OpenShiftProvisionerTestBase.getInfinispanOperatorApplication())
+					// MySQL
+					, new MysqlImageOpenShiftProvisioner(OpenShiftProvisionerTestBase.getMysqlOpenShiftApplication())
+					// PostgreSql
+					, new PostgreSQLImageOpenShiftProvisioner(
+							OpenShiftProvisionerTestBase.getPostgreSQLImageOpenShiftApplication())
+					, new PostgreSQLTemplateOpenShiftProvisioner(
+							OpenShiftProvisionerTestBase.getPostgreSQLTemplateOpenShiftApplication())
+					);
 		} else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) {
 			return Stream.of(
 					// EAP latest GA
 					new WildflyImageOpenShiftProvisioner(
-							OpenShiftProvisionerTestBase.getWildflyOpenShiftLocalBinaryTargetServerApplication()),
+							OpenShiftProvisionerTestBase.getWildflyOpenShiftLocalBinaryTargetServerApplication())
 					// EAP 7
-					new Eap7ImageOpenShiftProvisioner(OpenShiftProvisionerTestBase.getEap7OpenShiftImageApplication()),
+					, new Eap7ImageOpenShiftProvisioner(OpenShiftProvisionerTestBase.getEap7OpenShiftImageApplication())
 					// RHSSO 7.6.x
-					new RhSsoTemplateOpenShiftProvisioner(OpenShiftProvisionerTestBase.getHttpsRhSso()),
+					, new RhSsoTemplateOpenShiftProvisioner(OpenShiftProvisionerTestBase.getHttpsRhSso())
 					// RHBK
-					new KeycloakOperatorProvisioner(
-							OpenShiftProvisionerTestBase.getKeycloakOperatorApplication()));
+					, new KeycloakOperatorProvisioner(
+							OpenShiftProvisionerTestBase.getKeycloakOperatorApplication())
+					// RHDG
+					, new InfinispanOperatorProvisioner(OpenShiftProvisionerTestBase.getInfinispanOperatorApplication())
+			);
 		} else {
 			throw new IllegalStateException(
 					String.format("Unknown Intersmash test suite execution profile: %s",