From 37e82a8f9452a681a18aa9be88e6d910f49b2f37 Mon Sep 17 00:00:00 2001 From: Fabio Burzigotti Date: Fri, 30 Jun 2023 18:03:43 +0200 Subject: [PATCH] fix --- .github/workflows/kubernetes-e2e.yml | 26 ++++++++++++++++ testsuite/pom.xml | 2 +- .../testsuite/k8s/KubernetesTest.java | 17 ++++++++++ .../testsuite/openshift/OpenShiftTest.java | 17 ++++++++++ ...foilKubernetesOperatorProvisionerTest.java | 4 ++- ...veMQOpenShiftOperatorProvisionerTest.java} | 7 +++-- ...rfoilOpenShiftOperatorProvisionerTest.java | 6 ++-- ...spanOpenShiftOperatorProvisionerTest.java} | 7 +++-- ...afkaOpenShiftOperatorProvisionerTest.java} | 7 +++-- ...loakOpenShiftOperatorProvisionerTest.java} | 7 +++-- ...portOpenShiftOperatorProvisionerTest.java} | 10 +++--- .../openshift/MysqlImageTestCase.java | 5 ++- .../OpenShiftProvisionerTestBase.java | 10 +++--- .../openshift/PostgreSQLImageTestCase.java | 5 ++- .../openshift/ProvisionerCleanupTestCase.java | 5 ++- .../openshift/WildflyBootableJarTestCase.java | 5 ++- .../WildflyHelmChartProvisionerTest.java | 5 ++- .../WildflyImageProvisionerTestCase.java | 5 ++- .../WildflyJavaxBootableJarTestCase.java | 5 ++- .../WildflyMavenProjectTestCase.java | 5 ++- ...dflyOpenShiftOperatorProvisionerTest.java} | 10 +++--- .../WildflyTargetServerTestCase.java | 5 ++- ...penShiftOperatorSubscriptionTestCase.java} | 17 +++++----- ...stomResourceDefinitionContextProvider.java | 8 ----- .../OpenShiftOperatorProvisioner.java | 31 ------------------- .../{openshift => }/input/BinarySource.java | 2 +- .../input/BinarySourceBuilder.java | 2 +- .../{openshift => }/input/BuildInput.java | 2 +- .../input/BuildInputBuilder.java | 2 +- .../{openshift => }/input/GitSource.java | 2 +- .../input/GitSourceBuilder.java | 2 +- .../BootableJarOpenShiftApplication.java | 2 +- .../WildflyImageOpenShiftApplication.java | 8 ++--- .../ActiveMQOperatorApplication.java | 4 +-- .../HyperfoilOperatorApplication.java | 4 +-- .../InfinispanOperatorApplication.java | 3 +- .../KafkaOperatorApplication.java | 4 +-- .../KeycloakOperatorApplication.java | 3 +- ...eycloakRealmImportOperatorApplication.java | 3 +- .../WildflyOperatorApplication.java | 3 +- ...yperfoilKubernetesOperatorProvisioner.java | 2 +- .../ActiveMQOpenShiftOperatorProvisioner.java | 2 +- .../ActiveMQOperatorProvisionerFactory.java | 2 +- .../BootableJarImageOpenShiftProvisioner.java | 4 +-- ...HyperfoilOpenShiftOperatorProvisioner.java | 2 +- ...nfinispanOpenShiftOperatorProvisioner.java | 2 +- .../InfinispanOperatorProvisionerFactory.java | 2 +- .../KafkaOpenShiftOperatorProvisioner.java | 2 +- .../KafkaOperatorProvisionerFactory.java | 2 +- .../KeycloakOpenShiftOperatorProvisioner.java | 2 +- .../KeycloakOperatorProvisionerFactory.java | 2 +- ...almImportOpenShiftOperatorProvisioner.java | 2 +- ...RealmImportOperatorProvisionerFactory.java | 2 +- .../WildflyImageOpenShiftProvisioner.java | 6 ++-- .../WildflyOpenShiftOperatorProvisioner.java | 2 +- .../WildflyOperatorProvisionerFactory.java | 2 +- .../operator/ActiveMQOperatorProvisioner.java | 2 +- .../HyperfoilOperatorProvisioner.java | 2 +- .../InfinispanOperatorProvisioner.java | 2 +- .../operator/KafkaOperatorProvisioner.java | 2 +- .../operator/KeycloakOperatorProvisioner.java | 2 +- ...eycloakRealmImportOperatorProvisioner.java | 2 +- .../operator/WildflyOperatorProvisioner.java | 2 +- .../provision/ProvisionerManagerTestCase.java | 6 ++-- 64 files changed, 197 insertions(+), 138 deletions(-) create mode 100644 .github/workflows/kubernetes-e2e.yml create mode 100644 testsuite/src/main/java/org/jboss/intersmash/testsuite/k8s/KubernetesTest.java create mode 100644 testsuite/src/main/java/org/jboss/intersmash/testsuite/openshift/OpenShiftTest.java rename testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/{ActiveMQOperatorProvisionerTest.java => ActiveMQOpenShiftOperatorProvisionerTest.java} (95%) rename testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/{InfinispanOperatorProvisionerTest.java => InfinispanOpenShiftOperatorProvisionerTest.java} (98%) rename testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/{KafkaOperatorProvisionerTest.java => KafkaOpenShiftOperatorProvisionerTest.java} (96%) rename testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/{KeycloakOperatorProvisionerTest.java => KeycloakOpenShiftOperatorProvisionerTest.java} (98%) rename testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/{KeycloakRealmImportOperatorProvisionerTest.java => KeycloakRealmImportOpenShiftOperatorProvisionerTest.java} (97%) rename testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/{WildflyOperatorProvisionerTest.java => WildflyOpenShiftOperatorProvisionerTest.java} (91%) rename testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/operator/{OperatorSubscriptionTestCase.java => OpenShiftOperatorSubscriptionTestCase.java} (86%) delete mode 100644 tools/intersmash-kubernetes-client/src/main/java/org/jboss/intersmash/tools/k8s/client/CustomResourceDefinitionContextProvider.java delete mode 100644 tools/intersmash-tools-core/src/main/java/org/jboss/intersmash/tools/provision/openshift/operator/OpenShiftOperatorProvisioner.java rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => }/input/BinarySource.java (92%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => }/input/BinarySourceBuilder.java (92%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => }/input/BuildInput.java (92%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => }/input/BuildInputBuilder.java (97%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => }/input/GitSource.java (92%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => }/input/GitSourceBuilder.java (92%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => operator}/ActiveMQOperatorApplication.java (90%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => operator}/HyperfoilOperatorApplication.java (84%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => operator}/InfinispanOperatorApplication.java (90%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => operator}/KafkaOperatorApplication.java (94%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => operator}/KeycloakOperatorApplication.java (93%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => operator}/KeycloakRealmImportOperatorApplication.java (90%) rename tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/{openshift => operator}/WildflyOperatorApplication.java (89%) diff --git a/.github/workflows/kubernetes-e2e.yml b/.github/workflows/kubernetes-e2e.yml new file mode 100644 index 00000000..7a1eadbd --- /dev/null +++ b/.github/workflows/kubernetes-e2e.yml @@ -0,0 +1,26 @@ +name: Intersmash - Simple build workflow + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + simple-build: + if: '! github.event.pull_request.draft' + runs-on: ubuntu-latest + + steps: + - name: Set up Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.8.7 + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: Build with Maven + run: mvn -version ; mvn clean install -U -B -DskipTests diff --git a/testsuite/pom.xml b/testsuite/pom.xml index aa8363ac..9a7f619c 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/testsuite/src/main/java/org/jboss/intersmash/testsuite/k8s/KubernetesTest.java b/testsuite/src/main/java/org/jboss/intersmash/testsuite/k8s/KubernetesTest.java new file mode 100644 index 00000000..368800a0 --- /dev/null +++ b/testsuite/src/main/java/org/jboss/intersmash/testsuite/k8s/KubernetesTest.java @@ -0,0 +1,17 @@ +package org.jboss.intersmash.testsuite.k8s; + +import org.junit.jupiter.api.Tag; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Mark test that runs against Kubernetes. + * Used per class. + */ +@Tag("ts.k8s") +@Retention(RetentionPolicy.RUNTIME) +@Target({ java.lang.annotation.ElementType.TYPE }) +public @interface KubernetesTest { +} diff --git a/testsuite/src/main/java/org/jboss/intersmash/testsuite/openshift/OpenShiftTest.java b/testsuite/src/main/java/org/jboss/intersmash/testsuite/openshift/OpenShiftTest.java new file mode 100644 index 00000000..b8da5b5b --- /dev/null +++ b/testsuite/src/main/java/org/jboss/intersmash/testsuite/openshift/OpenShiftTest.java @@ -0,0 +1,17 @@ +package org.jboss.intersmash.testsuite.openshift; + +import org.junit.jupiter.api.Tag; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Mark test that runs against OpenShift. + * Used per class. + */ +@Tag("ts.openshift") +@Retention(RetentionPolicy.RUNTIME) +@Target({ java.lang.annotation.ElementType.TYPE }) +public @interface OpenShiftTest { +} diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/k8s/HyperfoilKubernetesOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/k8s/HyperfoilKubernetesOperatorProvisionerTest.java index 69c75e41..a59ade5c 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/k8s/HyperfoilKubernetesOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/k8s/HyperfoilKubernetesOperatorProvisionerTest.java @@ -21,8 +21,9 @@ import java.nio.file.Paths; import java.util.Arrays; +import org.jboss.intersmash.testsuite.k8s.KubernetesTest; import org.jboss.intersmash.testsuite.k8s.NamespaceCreationCapable; -import org.jboss.intersmash.tools.application.openshift.HyperfoilOperatorApplication; +import org.jboss.intersmash.tools.application.operator.HyperfoilOperatorApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.k8s.KubernetesConfig; import org.jboss.intersmash.tools.k8s.client.Kuberneteses; @@ -51,6 +52,7 @@ import io.hyperfoil.v1alpha2.hyperfoilspec.Route; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) +@KubernetesTest public class HyperfoilKubernetesOperatorProvisionerTest implements NamespaceCreationCapable { private static final Logger logger = LoggerFactory.getLogger(HyperfoilKubernetesOperatorProvisionerTest.class); private static final String NAME = "hyperfoil"; diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ActiveMQOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ActiveMQOpenShiftOperatorProvisionerTest.java similarity index 95% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ActiveMQOperatorProvisionerTest.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ActiveMQOpenShiftOperatorProvisionerTest.java index a0e9147b..2f457f02 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ActiveMQOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ActiveMQOpenShiftOperatorProvisionerTest.java @@ -19,7 +19,9 @@ import java.util.Collections; import java.util.List; -import org.jboss.intersmash.tools.application.openshift.ActiveMQOperatorApplication; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; +import org.jboss.intersmash.tools.application.operator.ActiveMQOperatorApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.provision.openshift.ActiveMQOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.operator.activemq.address.ActiveMQArtemisAddressBuilder; @@ -43,7 +45,8 @@ @Slf4j @CleanBeforeAll -public class ActiveMQOperatorProvisionerTest { +@OpenShiftTest +public class ActiveMQOpenShiftOperatorProvisionerTest implements ProjectCreationCapable { private static final ActiveMQOpenShiftOperatorProvisioner activeMQOperatorProvisioner = initializeOperatorProvisioner(); private static ActiveMQOpenShiftOperatorProvisioner initializeOperatorProvisioner() { diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/HyperfoilOpenShiftOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/HyperfoilOpenShiftOperatorProvisionerTest.java index 93714cbe..b2b2ccee 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/HyperfoilOpenShiftOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/HyperfoilOpenShiftOperatorProvisionerTest.java @@ -21,8 +21,9 @@ import java.nio.file.Paths; import java.util.Arrays; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; -import org.jboss.intersmash.tools.application.openshift.HyperfoilOperatorApplication; +import org.jboss.intersmash.tools.application.operator.HyperfoilOperatorApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.provision.openshift.HyperfoilOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.operator.hyperfoil.client.runschema.RunStatisticsWrapper; @@ -49,6 +50,7 @@ import io.hyperfoil.v1alpha2.HyperfoilBuilder; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) +@OpenShiftTest public class HyperfoilOpenShiftOperatorProvisionerTest implements ProjectCreationCapable { private static final Logger logger = LoggerFactory.getLogger(HyperfoilOpenShiftOperatorProvisionerTest.class); private static final String NAME = "hyperfoil"; @@ -86,7 +88,7 @@ public static void createOperatorGroup() throws IOException { public static void removeOperatorGroup() { OpenShifts.adminBinary().execute("delete", "operatorgroup", "--all"); // there might be leftovers in case of failures - OpenShifts.admin().pods().withLabel("role", "agent").delete(); + OpenShifts.admin().deletePods("role", "agent"); hyperfoilOperatorProvisioner.dismiss(); } diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/InfinispanOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/InfinispanOpenShiftOperatorProvisionerTest.java similarity index 98% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/InfinispanOperatorProvisionerTest.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/InfinispanOpenShiftOperatorProvisionerTest.java index c840cf12..321cff9c 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/InfinispanOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/InfinispanOpenShiftOperatorProvisionerTest.java @@ -22,7 +22,9 @@ import java.util.Map; import java.util.Objects; -import org.jboss.intersmash.tools.application.openshift.InfinispanOperatorApplication; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; +import org.jboss.intersmash.tools.application.operator.InfinispanOperatorApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.provision.openshift.InfinispanOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.operator.infinispan.cache.Cache; @@ -58,7 +60,8 @@ */ @Slf4j @CleanBeforeAll -public class InfinispanOperatorProvisionerTest { +@OpenShiftTest +public class InfinispanOpenShiftOperatorProvisionerTest implements ProjectCreationCapable { static final String TEST_SECRET_USERNAME = "developer"; static final String TEST_SECRET_PASSWORD = "developer"; static final String TEST_SECRET_NAME = "test-secret"; diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOpenShiftOperatorProvisionerTest.java similarity index 96% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOpenShiftOperatorProvisionerTest.java index 68c49a9b..d265287d 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KafkaOpenShiftOperatorProvisionerTest.java @@ -17,7 +17,9 @@ import java.io.IOException; -import org.jboss.intersmash.tools.application.openshift.KafkaOperatorApplication; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; +import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.provision.openshift.KafkaOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.operator.resources.OperatorGroup; @@ -39,7 +41,8 @@ */ @Slf4j @CleanBeforeAll -public class KafkaOperatorProvisionerTest { +@OpenShiftTest +public class KafkaOpenShiftOperatorProvisionerTest implements ProjectCreationCapable { private static KafkaOperatorApplication application = OpenShiftProvisionerTestBase.getKafkaApplication(); private static final KafkaOpenShiftOperatorProvisioner operatorProvisioner = initializeOperatorProvisioner(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakOpenShiftOperatorProvisionerTest.java similarity index 98% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakOperatorProvisionerTest.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakOpenShiftOperatorProvisionerTest.java index 31b0baa7..382be9df 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakOpenShiftOperatorProvisionerTest.java @@ -21,7 +21,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.intersmash.tools.application.openshift.KeycloakOperatorApplication; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; +import org.jboss.intersmash.tools.application.operator.KeycloakOperatorApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.provision.openshift.KeycloakOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.operator.keycloak.backup.KeycloakBackup; @@ -75,7 +77,8 @@ @Slf4j @CleanBeforeAll @Disabled("WIP - Disabled until global-test.properties is configured with the required property") -public class KeycloakOperatorProvisionerTest { +@OpenShiftTest +public class KeycloakOpenShiftOperatorProvisionerTest implements ProjectCreationCapable { // Be aware that since we're using the static mock application, not all provisioner methods will work as expected! private static final KeycloakOpenShiftOperatorProvisioner KEYCLOAK_OPERATOR_PROVISIONER = initializeOperatorProvisioner(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakRealmImportOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisionerTest.java similarity index 97% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakRealmImportOperatorProvisionerTest.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisionerTest.java index c35141cc..ee8f9967 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakRealmImportOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisionerTest.java @@ -22,7 +22,9 @@ import java.util.Map; import java.util.Objects; -import org.jboss.intersmash.tools.application.openshift.KeycloakRealmImportOperatorApplication; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; +import org.jboss.intersmash.tools.application.operator.KeycloakRealmImportOperatorApplication; import org.jboss.intersmash.tools.application.openshift.PostgreSQLImageOpenShiftApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.provision.openshift.KeycloakRealmImportOpenShiftOperatorProvisioner; @@ -70,7 +72,8 @@ */ @Slf4j @CleanBeforeAll -public class KeycloakRealmImportOperatorProvisionerTest { +@OpenShiftTest +public class KeycloakRealmImportOpenShiftOperatorProvisionerTest implements ProjectCreationCapable { private static KeycloakRealmImportOpenShiftOperatorProvisioner KEYCLOAK_OPERATOR_PROVISIONER; private static final String POSTGRESQL_NAME = "postgresql"; @@ -102,8 +105,7 @@ public String getDbName() { private static final PostgreSQLImageOpenShiftProvisioner POSTGRESQL_IMAGE_PROVISIONER = new PostgreSQLImageOpenShiftProvisioner( pgSQLApplication); - private static KeycloakRealmImportOpenShiftOperatorProvisioner initializeOperatorProvisioner(final Keycloak keycloak, - final String appName) { + private static KeycloakRealmImportOpenShiftOperatorProvisioner initializeOperatorProvisioner(final Keycloak keycloak, final String appName) { KeycloakRealmImportOpenShiftOperatorProvisioner operatorProvisioner = new KeycloakRealmImportOpenShiftOperatorProvisioner( new KeycloakRealmImportOperatorApplication() { diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/MysqlImageTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/MysqlImageTestCase.java index 8c24a0a4..6fe50614 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/MysqlImageTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/MysqlImageTestCase.java @@ -16,6 +16,8 @@ package org.jboss.intersmash.testsuite.provision.openshift; import org.assertj.core.api.Assertions; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.application.openshift.MysqlImageOpenShiftApplication; import org.jboss.intersmash.tools.provision.openshift.MysqlImageOpenShiftProvisioner; import org.junit.jupiter.api.AfterAll; @@ -29,7 +31,8 @@ @CleanBeforeAll @Slf4j -public class MysqlImageTestCase { +@OpenShiftTest +public class MysqlImageTestCase implements ProjectCreationCapable { private static final OpenShift openShift = OpenShifts.master(); private static final MysqlImageOpenShiftApplication application = OpenShiftProvisionerTestBase .getMysqlOpenShiftApplication(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java index 9bde9744..42876c14 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java @@ -28,15 +28,16 @@ import org.assertj.core.util.Strings; import org.jboss.intersmash.deployments.IntersmashDelpoyableWildflyApplication; import org.jboss.intersmash.deployments.IntersmashSharedDeployments; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; import org.jboss.intersmash.tools.IntersmashConfig; import org.jboss.intersmash.tools.application.openshift.BootableJarOpenShiftApplication; -import org.jboss.intersmash.tools.application.openshift.KafkaOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication; import org.jboss.intersmash.tools.application.openshift.MysqlImageOpenShiftApplication; import org.jboss.intersmash.tools.application.openshift.PostgreSQLImageOpenShiftApplication; import org.jboss.intersmash.tools.application.openshift.WildflyImageOpenShiftApplication; -import org.jboss.intersmash.tools.application.openshift.input.BinarySource; -import org.jboss.intersmash.tools.application.openshift.input.BuildInput; -import org.jboss.intersmash.tools.application.openshift.input.BuildInputBuilder; +import org.jboss.intersmash.tools.application.input.BinarySource; +import org.jboss.intersmash.tools.application.input.BuildInput; +import org.jboss.intersmash.tools.application.input.BuildInputBuilder; import org.jboss.intersmash.tools.util.IntersmashToolsProvisionersProperties; import cz.xtf.builder.builders.SecretBuilder; @@ -59,6 +60,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j +@OpenShiftTest public class OpenShiftProvisionerTestBase { static final EnvVar TEST_ENV_VAR = new EnvVarBuilder().withName("test-evn-key").withValue("test-evn-value").build(); static final String TEST_SECRET_FOO = "foo"; diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/PostgreSQLImageTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/PostgreSQLImageTestCase.java index 4354b53f..bd09852c 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/PostgreSQLImageTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/PostgreSQLImageTestCase.java @@ -16,6 +16,8 @@ package org.jboss.intersmash.testsuite.provision.openshift; import org.assertj.core.api.Assertions; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.application.openshift.PostgreSQLImageOpenShiftApplication; import org.jboss.intersmash.tools.provision.openshift.PostgreSQLImageOpenShiftProvisioner; import org.junit.jupiter.api.AfterAll; @@ -29,7 +31,8 @@ @CleanBeforeAll @Slf4j -public class PostgreSQLImageTestCase { +@OpenShiftTest +public class PostgreSQLImageTestCase implements ProjectCreationCapable { private static final OpenShift openShift = OpenShifts.master(); private static final PostgreSQLImageOpenShiftApplication application = OpenShiftProvisionerTestBase .getPostgreSQLOpenShiftApplication(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java index 93acfe5a..b605b63d 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java @@ -17,6 +17,8 @@ import java.util.stream.Stream; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.provision.openshift.OpenShiftProvisioner; import org.jboss.intersmash.tools.provision.openshift.WildflyBootableJarImageOpenShiftProvisioner; import org.junit.jupiter.api.Assertions; @@ -29,7 +31,8 @@ import io.fabric8.kubernetes.api.model.ConfigMapBuilder; @CleanBeforeEach -public class ProvisionerCleanupTestCase { +@OpenShiftTest +public class ProvisionerCleanupTestCase implements ProjectCreationCapable { protected static final OpenShift openShift = OpenShifts.master(); private static Stream provisionerProvider() { diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyBootableJarTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyBootableJarTestCase.java index 6a9a518c..014484de 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyBootableJarTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyBootableJarTestCase.java @@ -16,6 +16,8 @@ package org.jboss.intersmash.testsuite.provision.openshift; import org.assertj.core.api.Assertions; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.application.openshift.BootableJarOpenShiftApplication; import org.jboss.intersmash.tools.provision.openshift.BootableJarImageOpenShiftProvisioner; import org.jboss.intersmash.tools.provision.openshift.WildflyBootableJarImageOpenShiftProvisioner; @@ -29,7 +31,8 @@ import cz.xtf.junit5.annotations.CleanBeforeAll; @CleanBeforeAll -public class WildflyBootableJarTestCase { +@OpenShiftTest +public class WildflyBootableJarTestCase implements ProjectCreationCapable { private static final OpenShift openShift = OpenShifts.master(); private static final BootableJarOpenShiftApplication application = OpenShiftProvisionerTestBase .getWildflyBootableJarOpenShiftApplication(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartProvisionerTest.java index 9913ad88..9744066a 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartProvisionerTest.java @@ -15,6 +15,8 @@ */ package org.jboss.intersmash.testsuite.provision.openshift; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.application.openshift.helm.WildflyHelmChartOpenShiftApplication; import org.jboss.intersmash.tools.provision.helm.HelmChartOpenShiftProvisioner; import org.jboss.intersmash.tools.provision.helm.WildflyHelmChartOpenShiftProvisioner; @@ -29,7 +31,8 @@ * programmatically */ @CleanBeforeAll -public class WildflyHelmChartProvisionerTest { +@OpenShiftTest +public class WildflyHelmChartProvisionerTest implements ProjectCreationCapable { @Test //@Disabled("No artifacts on a Maven repo which is reachable by the Pod") diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyImageProvisionerTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyImageProvisionerTestCase.java index 08a9b54f..14bf1987 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyImageProvisionerTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyImageProvisionerTestCase.java @@ -23,6 +23,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.api.SoftAssertions; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.application.openshift.WildflyImageOpenShiftApplication; import org.jboss.intersmash.tools.provision.openshift.WildflyImageOpenShiftProvisioner; import org.junit.jupiter.api.AfterAll; @@ -45,7 +47,8 @@ * inside the builder image. */ @CleanBeforeAll -public class WildflyImageProvisionerTestCase { +@OpenShiftTest +public class WildflyImageProvisionerTestCase implements ProjectCreationCapable { private static final OpenShift openShift = OpenShifts.master(); private static final WildflyImageOpenShiftApplication application = OpenShiftProvisionerTestBase .getWildflyOpenShiftImageApplication(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyJavaxBootableJarTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyJavaxBootableJarTestCase.java index 51d127fe..589c951c 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyJavaxBootableJarTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyJavaxBootableJarTestCase.java @@ -16,6 +16,8 @@ package org.jboss.intersmash.testsuite.provision.openshift; import org.assertj.core.api.Assertions; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.application.openshift.BootableJarOpenShiftApplication; import org.jboss.intersmash.tools.provision.openshift.BootableJarImageOpenShiftProvisioner; import org.jboss.intersmash.tools.provision.openshift.WildflyBootableJarImageOpenShiftProvisioner; @@ -29,7 +31,8 @@ import cz.xtf.junit5.annotations.CleanBeforeAll; @CleanBeforeAll -public class WildflyJavaxBootableJarTestCase { +@OpenShiftTest +public class WildflyJavaxBootableJarTestCase implements ProjectCreationCapable { private static final OpenShift openShift = OpenShifts.master(); private static final BootableJarOpenShiftApplication application = OpenShiftProvisionerTestBase .getWildflyBootableJarJavaxOpenShiftApplication(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyMavenProjectTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyMavenProjectTestCase.java index e5049241..fb58a3f5 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyMavenProjectTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyMavenProjectTestCase.java @@ -23,6 +23,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.api.SoftAssertions; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.provision.openshift.WildflyImageOpenShiftProvisioner; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -44,7 +46,8 @@ * inside the builder image via the s2i binary build process. */ @CleanBeforeAll -public class WildflyMavenProjectTestCase { +@OpenShiftTest +public class WildflyMavenProjectTestCase implements ProjectCreationCapable { private static final OpenShift openShift = OpenShifts.master(); private static final OpenShiftProvisionerTestBase.StaticWildflyImageOpenShiftApplication application = OpenShiftProvisionerTestBase .getWildflyOpenShiftLocalBinarySourceApplication(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyOpenShiftOperatorProvisionerTest.java similarity index 91% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyOperatorProvisionerTest.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyOpenShiftOperatorProvisionerTest.java index 4fc51a92..e9ace76c 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyOpenShiftOperatorProvisionerTest.java @@ -17,10 +17,11 @@ import java.io.IOException; -import org.jboss.intersmash.tools.application.openshift.WildflyOperatorApplication; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; +import org.jboss.intersmash.tools.application.operator.WildflyOperatorApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.provision.openshift.WildflyOpenShiftOperatorProvisioner; -import org.jboss.intersmash.tools.provision.openshift.operator.OpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.operator.resources.OperatorGroup; import org.jboss.intersmash.tools.provision.openshift.operator.wildfly.WildFlyServer; import org.jboss.intersmash.tools.provision.openshift.operator.wildfly.WildFlyServerBuilder; @@ -37,7 +38,8 @@ import io.fabric8.kubernetes.api.model.DeletionPropagation; @CleanBeforeAll -public class WildflyOperatorProvisionerTest { +@OpenShiftTest +public class WildflyOpenShiftOperatorProvisionerTest implements ProjectCreationCapable { private static final String NAME = "wildfly-operator-test"; private static final WildflyOpenShiftOperatorProvisioner WILDFLY_OPERATOR_PROVISIONER = initializeOperatorProvisioner(); @@ -94,7 +96,7 @@ public void customResourcesCleanup() { * Checking through {@link WildflyOpenShiftOperatorProvisioner#getPods()} here would intermittently find a resumed app pod * before unsubscribe (which doesn't wait ATM) finishes. * Basically there could be room for revisiting {@link WildflyOpenShiftOperatorProvisioner#undeploy} and - * {@link OpenShiftOperatorProvisioner#unsubscribe()} + * {@link org.jboss.intersmash.tools.provision.operator.OperatorProvisioner#unsubscribe()} */ @Test public void basicProvisioningTest() { diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyTargetServerTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyTargetServerTestCase.java index 23e98938..7709f829 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyTargetServerTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyTargetServerTestCase.java @@ -23,6 +23,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.api.SoftAssertions; +import org.jboss.intersmash.testsuite.openshift.OpenShiftTest; +import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable; import org.jboss.intersmash.tools.application.openshift.WildflyImageOpenShiftApplication; import org.jboss.intersmash.tools.provision.openshift.WildflyImageOpenShiftProvisioner; import org.junit.jupiter.api.AfterAll; @@ -46,7 +48,8 @@ * which are compatible with a WildFly/EAP s2i v2 binary build. */ @CleanBeforeAll -public class WildflyTargetServerTestCase { +@OpenShiftTest +public class WildflyTargetServerTestCase implements ProjectCreationCapable { private static final OpenShift openShift = OpenShifts.master(); private static final WildflyImageOpenShiftApplication application = OpenShiftProvisionerTestBase .getWildflyOpenShiftLocalBinaryTargetServerApplication(); diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/operator/OperatorSubscriptionTestCase.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/operator/OpenShiftOperatorSubscriptionTestCase.java similarity index 86% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/operator/OperatorSubscriptionTestCase.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/operator/OpenShiftOperatorSubscriptionTestCase.java index 2b59e129..4251e1f1 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/operator/OperatorSubscriptionTestCase.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/operator/OpenShiftOperatorSubscriptionTestCase.java @@ -21,12 +21,12 @@ import java.util.List; import java.util.stream.Stream; -import org.jboss.intersmash.tools.application.openshift.ActiveMQOperatorApplication; -import org.jboss.intersmash.tools.application.openshift.HyperfoilOperatorApplication; -import org.jboss.intersmash.tools.application.openshift.InfinispanOperatorApplication; -import org.jboss.intersmash.tools.application.openshift.KafkaOperatorApplication; -import org.jboss.intersmash.tools.application.openshift.KeycloakOperatorApplication; -import org.jboss.intersmash.tools.application.openshift.WildflyOperatorApplication; +import org.jboss.intersmash.tools.application.operator.ActiveMQOperatorApplication; +import org.jboss.intersmash.tools.application.operator.HyperfoilOperatorApplication; +import org.jboss.intersmash.tools.application.operator.InfinispanOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KeycloakOperatorApplication; +import org.jboss.intersmash.tools.application.operator.WildflyOperatorApplication; import org.jboss.intersmash.tools.junit5.IntersmashExtension; import org.jboss.intersmash.tools.provision.openshift.ActiveMQOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.HyperfoilOpenShiftOperatorProvisioner; @@ -34,7 +34,6 @@ import org.jboss.intersmash.tools.provision.openshift.KafkaOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.KeycloakOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.WildflyOpenShiftOperatorProvisioner; -import org.jboss.intersmash.tools.provision.openshift.operator.OpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.operator.resources.OperatorGroup; import org.jboss.intersmash.tools.provision.operator.OperatorProvisioner; import org.junit.jupiter.api.AfterAll; @@ -50,11 +49,11 @@ import lombok.extern.slf4j.Slf4j; /** - * Verify the {@link OpenShiftOperatorProvisioner} subscription process. + * Verify the {@link OperatorProvisioner} subscription process. */ @Slf4j @CleanBeforeAll -public class OperatorSubscriptionTestCase { +public class OpenShiftOperatorSubscriptionTestCase { private static Stream provisionerProvider() { return Stream.of( diff --git a/tools/intersmash-kubernetes-client/src/main/java/org/jboss/intersmash/tools/k8s/client/CustomResourceDefinitionContextProvider.java b/tools/intersmash-kubernetes-client/src/main/java/org/jboss/intersmash/tools/k8s/client/CustomResourceDefinitionContextProvider.java deleted file mode 100644 index 23ef07b2..00000000 --- a/tools/intersmash-kubernetes-client/src/main/java/org/jboss/intersmash/tools/k8s/client/CustomResourceDefinitionContextProvider.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jboss.intersmash.tools.k8s.client; - -import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext; - -public interface CustomResourceDefinitionContextProvider { - - CustomResourceDefinitionContext getContext(); -} \ No newline at end of file diff --git a/tools/intersmash-tools-core/src/main/java/org/jboss/intersmash/tools/provision/openshift/operator/OpenShiftOperatorProvisioner.java b/tools/intersmash-tools-core/src/main/java/org/jboss/intersmash/tools/provision/openshift/operator/OpenShiftOperatorProvisioner.java deleted file mode 100644 index 70b2cdf3..00000000 --- a/tools/intersmash-tools-core/src/main/java/org/jboss/intersmash/tools/provision/openshift/operator/OpenShiftOperatorProvisioner.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (C) 2023 Red Hat, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.intersmash.tools.provision.openshift.operator; - -import org.jboss.intersmash.tools.provision.operator.OlmOperatorProvisioner; - -/** - * Provisioner for operator service subscription. - *

- * Use the following oc commands to track the progress of services. - * oc get packagemanifest -n openshift-marketplace - * oc get operatorgroups - * oc get subscriptions - * oc get installplans - * oc get clusterserviceversion - */ -public interface OpenShiftOperatorProvisioner extends OlmOperatorProvisioner { -} diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BinarySource.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BinarySource.java similarity index 92% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BinarySource.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BinarySource.java index dd568e4b..13dfcf37 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BinarySource.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BinarySource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift.input; +package org.jboss.intersmash.tools.application.input; import java.nio.file.Path; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BinarySourceBuilder.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BinarySourceBuilder.java similarity index 92% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BinarySourceBuilder.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BinarySourceBuilder.java index 20aa3e78..b99d18e6 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BinarySourceBuilder.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BinarySourceBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift.input; +package org.jboss.intersmash.tools.application.input; import java.nio.file.Path; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BuildInput.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BuildInput.java similarity index 92% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BuildInput.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BuildInput.java index 710f2cd2..04fce25d 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BuildInput.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BuildInput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift.input; +package org.jboss.intersmash.tools.application.input; /** * Use the {@link BuildInputBuilder} to get instances implementing the {@link BuildInput} interface. diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BuildInputBuilder.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BuildInputBuilder.java similarity index 97% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BuildInputBuilder.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BuildInputBuilder.java index 3d2ea565..07995310 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/BuildInputBuilder.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/BuildInputBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift.input; +package org.jboss.intersmash.tools.application.input; import java.io.File; import java.io.IOException; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/GitSource.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/GitSource.java similarity index 92% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/GitSource.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/GitSource.java index 0602f152..1f3634d1 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/GitSource.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/GitSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift.input; +package org.jboss.intersmash.tools.application.input; /** * {@link BuildInput} represented by Git URI and reference diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/GitSourceBuilder.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/GitSourceBuilder.java similarity index 92% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/GitSourceBuilder.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/GitSourceBuilder.java index 98ba9598..ba8285fb 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/input/GitSourceBuilder.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/input/GitSourceBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift.input; +package org.jboss.intersmash.tools.application.input; public interface GitSourceBuilder { diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/BootableJarOpenShiftApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/BootableJarOpenShiftApplication.java index 57b08e49..24f1555a 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/BootableJarOpenShiftApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/BootableJarOpenShiftApplication.java @@ -18,7 +18,7 @@ import java.util.Collections; import java.util.List; -import org.jboss.intersmash.tools.application.openshift.input.BinarySource; +import org.jboss.intersmash.tools.application.input.BinarySource; import org.jboss.intersmash.tools.provision.openshift.WildflyBootableJarImageOpenShiftProvisioner; import io.fabric8.kubernetes.api.model.EnvVar; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/WildflyImageOpenShiftApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/WildflyImageOpenShiftApplication.java index d746313d..0222412c 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/WildflyImageOpenShiftApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/WildflyImageOpenShiftApplication.java @@ -21,10 +21,10 @@ import java.util.Map; import java.util.Set; -import org.jboss.intersmash.tools.application.openshift.input.BinarySourceBuilder; -import org.jboss.intersmash.tools.application.openshift.input.BuildInput; -import org.jboss.intersmash.tools.application.openshift.input.BuildInputBuilder; -import org.jboss.intersmash.tools.application.openshift.input.GitSourceBuilder; +import org.jboss.intersmash.tools.application.input.BinarySourceBuilder; +import org.jboss.intersmash.tools.application.input.BuildInput; +import org.jboss.intersmash.tools.application.input.BuildInputBuilder; +import org.jboss.intersmash.tools.application.input.GitSourceBuilder; import cz.xtf.builder.builders.pod.PersistentVolumeClaim; import cz.xtf.builder.builders.pod.VolumeMount; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/ActiveMQOperatorApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/ActiveMQOperatorApplication.java similarity index 90% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/ActiveMQOperatorApplication.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/ActiveMQOperatorApplication.java index 0770da95..f2ae7db3 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/ActiveMQOperatorApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/ActiveMQOperatorApplication.java @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift; +package org.jboss.intersmash.tools.application.operator; import java.util.List; -import org.jboss.intersmash.tools.application.operator.OperatorApplication; - import io.amq.broker.v1beta1.ActiveMQArtemis; import io.amq.broker.v1beta1.ActiveMQArtemisAddress; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/HyperfoilOperatorApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/HyperfoilOperatorApplication.java similarity index 84% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/HyperfoilOperatorApplication.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/HyperfoilOperatorApplication.java index 8b7353fb..e862a688 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/HyperfoilOperatorApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/HyperfoilOperatorApplication.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift; - -import org.jboss.intersmash.tools.application.operator.OperatorApplication; +package org.jboss.intersmash.tools.application.operator; import io.hyperfoil.v1alpha2.Hyperfoil; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/InfinispanOperatorApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/InfinispanOperatorApplication.java similarity index 90% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/InfinispanOperatorApplication.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/InfinispanOperatorApplication.java index 62b8a2d9..072f26a0 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/InfinispanOperatorApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/InfinispanOperatorApplication.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift; +package org.jboss.intersmash.tools.application.operator; import java.util.List; -import org.jboss.intersmash.tools.application.operator.OperatorApplication; import org.jboss.intersmash.tools.provision.openshift.operator.infinispan.cache.Cache; import org.jboss.intersmash.tools.provision.openshift.operator.infinispan.infinispan.Infinispan; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KafkaOperatorApplication.java similarity index 94% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KafkaOperatorApplication.java index 828d5ea2..81e21888 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KafkaOperatorApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KafkaOperatorApplication.java @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift; +package org.jboss.intersmash.tools.application.operator; import java.util.List; -import org.jboss.intersmash.tools.application.operator.OperatorApplication; - import io.strimzi.api.kafka.model.Kafka; import io.strimzi.api.kafka.model.KafkaTopic; import io.strimzi.api.kafka.model.KafkaUser; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KeycloakOperatorApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KeycloakOperatorApplication.java similarity index 93% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KeycloakOperatorApplication.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KeycloakOperatorApplication.java index 62c177af..66b39f7a 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KeycloakOperatorApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KeycloakOperatorApplication.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift; +package org.jboss.intersmash.tools.application.operator; import java.util.Collections; import java.util.List; -import org.jboss.intersmash.tools.application.operator.OperatorApplication; import org.jboss.intersmash.tools.provision.openshift.operator.keycloak.backup.KeycloakBackup; import org.jboss.intersmash.tools.provision.openshift.operator.keycloak.client.KeycloakClient; import org.jboss.intersmash.tools.provision.openshift.operator.keycloak.keycloak.Keycloak; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KeycloakRealmImportOperatorApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KeycloakRealmImportOperatorApplication.java similarity index 90% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KeycloakRealmImportOperatorApplication.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KeycloakRealmImportOperatorApplication.java index 9647d67a..2b556ad5 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/KeycloakRealmImportOperatorApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/KeycloakRealmImportOperatorApplication.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift; +package org.jboss.intersmash.tools.application.operator; import java.util.Collections; import java.util.List; -import org.jboss.intersmash.tools.application.operator.OperatorApplication; import org.jboss.intersmash.tools.provision.openshift.KeycloakRealmImportOpenShiftOperatorProvisioner; import org.keycloak.k8s.v2alpha1.Keycloak; import org.keycloak.k8s.v2alpha1.KeycloakRealmImport; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/WildflyOperatorApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/WildflyOperatorApplication.java similarity index 89% rename from tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/WildflyOperatorApplication.java rename to tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/WildflyOperatorApplication.java index 774f8ac5..63baff57 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/WildflyOperatorApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/operator/WildflyOperatorApplication.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.intersmash.tools.application.openshift; +package org.jboss.intersmash.tools.application.operator; -import org.jboss.intersmash.tools.application.operator.OperatorApplication; import org.jboss.intersmash.tools.provision.openshift.operator.wildfly.WildFlyServer; /** diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/k8s/HyperfoilKubernetesOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/k8s/HyperfoilKubernetesOperatorProvisioner.java index 8ead3081..dc1fc613 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/k8s/HyperfoilKubernetesOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/k8s/HyperfoilKubernetesOperatorProvisioner.java @@ -22,7 +22,7 @@ import java.util.Objects; import org.assertj.core.util.Strings; -import org.jboss.intersmash.tools.application.openshift.HyperfoilOperatorApplication; +import org.jboss.intersmash.tools.application.operator.HyperfoilOperatorApplication; import org.jboss.intersmash.tools.k8s.KubernetesConfig; import org.jboss.intersmash.tools.k8s.client.Kuberneteses; import org.jboss.intersmash.tools.provision.openshift.WaitersUtil; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/ActiveMQOpenShiftOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/ActiveMQOpenShiftOperatorProvisioner.java index b16cc059..56f3d295 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/ActiveMQOpenShiftOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/ActiveMQOpenShiftOperatorProvisioner.java @@ -18,7 +18,7 @@ import java.util.List; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.ActiveMQOperatorApplication; +import org.jboss.intersmash.tools.application.operator.ActiveMQOperatorApplication; import org.jboss.intersmash.tools.provision.openshift.operator.activemq.address.ActiveMQArtemisAddressList; import org.jboss.intersmash.tools.provision.openshift.operator.activemq.broker.ActiveMQArtemisList; import org.jboss.intersmash.tools.provision.operator.ActiveMQOperatorProvisioner; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/ActiveMQOperatorProvisionerFactory.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/ActiveMQOperatorProvisionerFactory.java index 252f3739..5637c779 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/ActiveMQOperatorProvisionerFactory.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/ActiveMQOperatorProvisionerFactory.java @@ -16,7 +16,7 @@ package org.jboss.intersmash.tools.provision.openshift; import org.jboss.intersmash.tools.application.Application; -import org.jboss.intersmash.tools.application.openshift.ActiveMQOperatorApplication; +import org.jboss.intersmash.tools.application.operator.ActiveMQOperatorApplication; import org.jboss.intersmash.tools.provision.ProvisionerFactory; import lombok.extern.slf4j.Slf4j; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/BootableJarImageOpenShiftProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/BootableJarImageOpenShiftProvisioner.java index 01ede174..140c298c 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/BootableJarImageOpenShiftProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/BootableJarImageOpenShiftProvisioner.java @@ -23,9 +23,9 @@ import java.util.stream.Collectors; import org.jboss.intersmash.tools.IntersmashConfig; +import org.jboss.intersmash.tools.application.input.BinarySource; +import org.jboss.intersmash.tools.application.input.BuildInput; import org.jboss.intersmash.tools.application.openshift.BootableJarOpenShiftApplication; -import org.jboss.intersmash.tools.application.openshift.input.BinarySource; -import org.jboss.intersmash.tools.application.openshift.input.BuildInput; import org.slf4j.event.Level; import cz.xtf.builder.builders.ApplicationBuilder; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/HyperfoilOpenShiftOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/HyperfoilOpenShiftOperatorProvisioner.java index 4b9389b2..24489358 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/HyperfoilOpenShiftOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/HyperfoilOpenShiftOperatorProvisioner.java @@ -21,7 +21,7 @@ import java.util.Objects; import org.assertj.core.util.Strings; -import org.jboss.intersmash.tools.application.openshift.HyperfoilOperatorApplication; +import org.jboss.intersmash.tools.application.operator.HyperfoilOperatorApplication; import org.jboss.intersmash.tools.provision.operator.HyperfoilOperatorProvisioner; import org.jboss.intersmash.tools.provision.operator.OperatorProvisioner; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/InfinispanOpenShiftOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/InfinispanOpenShiftOperatorProvisioner.java index cbb64c54..4223016e 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/InfinispanOpenShiftOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/InfinispanOpenShiftOperatorProvisioner.java @@ -18,7 +18,7 @@ import java.net.URL; import java.util.List; -import org.jboss.intersmash.tools.application.openshift.InfinispanOperatorApplication; +import org.jboss.intersmash.tools.application.operator.InfinispanOperatorApplication; import org.jboss.intersmash.tools.provision.openshift.operator.infinispan.cache.Cache; import org.jboss.intersmash.tools.provision.openshift.operator.infinispan.cache.CacheList; import org.jboss.intersmash.tools.provision.openshift.operator.infinispan.infinispan.Infinispan; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/InfinispanOperatorProvisionerFactory.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/InfinispanOperatorProvisionerFactory.java index 6dd469b0..af714f70 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/InfinispanOperatorProvisionerFactory.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/InfinispanOperatorProvisionerFactory.java @@ -16,7 +16,7 @@ package org.jboss.intersmash.tools.provision.openshift; import org.jboss.intersmash.tools.application.Application; -import org.jboss.intersmash.tools.application.openshift.InfinispanOperatorApplication; +import org.jboss.intersmash.tools.application.operator.InfinispanOperatorApplication; import org.jboss.intersmash.tools.provision.ProvisionerFactory; import lombok.extern.slf4j.Slf4j; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KafkaOpenShiftOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KafkaOpenShiftOperatorProvisioner.java index 894178f0..3689e115 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KafkaOpenShiftOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KafkaOpenShiftOperatorProvisioner.java @@ -18,7 +18,7 @@ import java.util.List; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.KafkaOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication; import org.jboss.intersmash.tools.provision.operator.KafkaOperatorProvisioner; import org.jboss.intersmash.tools.provision.operator.OperatorProvisioner; import org.slf4j.event.Level; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KafkaOperatorProvisionerFactory.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KafkaOperatorProvisionerFactory.java index 90d72d18..92d99500 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KafkaOperatorProvisionerFactory.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KafkaOperatorProvisionerFactory.java @@ -16,7 +16,7 @@ package org.jboss.intersmash.tools.provision.openshift; import org.jboss.intersmash.tools.application.Application; -import org.jboss.intersmash.tools.application.openshift.KafkaOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication; import org.jboss.intersmash.tools.provision.ProvisionerFactory; import lombok.extern.slf4j.Slf4j; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOpenShiftOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOpenShiftOperatorProvisioner.java index 78dcdff2..0ead3f98 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOpenShiftOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOpenShiftOperatorProvisioner.java @@ -21,7 +21,7 @@ import org.assertj.core.util.Strings; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.KeycloakOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KeycloakOperatorApplication; import org.jboss.intersmash.tools.provision.openshift.operator.keycloak.backup.KeycloakBackup; import org.jboss.intersmash.tools.provision.openshift.operator.keycloak.backup.KeycloakBackupList; import org.jboss.intersmash.tools.provision.openshift.operator.keycloak.client.KeycloakClient; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOperatorProvisionerFactory.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOperatorProvisionerFactory.java index d2414008..9bd1cd1e 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOperatorProvisionerFactory.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOperatorProvisionerFactory.java @@ -16,7 +16,7 @@ package org.jboss.intersmash.tools.provision.openshift; import org.jboss.intersmash.tools.application.Application; -import org.jboss.intersmash.tools.application.openshift.KeycloakOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KeycloakOperatorApplication; import org.jboss.intersmash.tools.provision.ProvisionerFactory; import lombok.extern.slf4j.Slf4j; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisioner.java index 3106e695..41e0d94a 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisioner.java @@ -21,7 +21,7 @@ import org.assertj.core.util.Strings; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.KeycloakRealmImportOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KeycloakRealmImportOperatorApplication; import org.jboss.intersmash.tools.provision.operator.KeycloakRealmImportOperatorProvisioner; import org.jboss.intersmash.tools.provision.operator.OperatorProvisioner; import org.keycloak.k8s.v2alpha1.Keycloak; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOperatorProvisionerFactory.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOperatorProvisionerFactory.java index 4de26f8e..b8ae3f82 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOperatorProvisionerFactory.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOperatorProvisionerFactory.java @@ -16,7 +16,7 @@ package org.jboss.intersmash.tools.provision.openshift; import org.jboss.intersmash.tools.application.Application; -import org.jboss.intersmash.tools.application.openshift.KeycloakRealmImportOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KeycloakRealmImportOperatorApplication; import org.jboss.intersmash.tools.provision.ProvisionerFactory; import lombok.extern.slf4j.Slf4j; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyImageOpenShiftProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyImageOpenShiftProvisioner.java index 0dee951b..bd24ef46 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyImageOpenShiftProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyImageOpenShiftProvisioner.java @@ -28,11 +28,11 @@ import org.assertj.core.util.Strings; import org.jboss.intersmash.tools.IntersmashConfig; +import org.jboss.intersmash.tools.application.input.BinarySource; +import org.jboss.intersmash.tools.application.input.BuildInput; +import org.jboss.intersmash.tools.application.input.GitSource; import org.jboss.intersmash.tools.application.openshift.WildflyImageOpenShiftApplication; import org.jboss.intersmash.tools.application.openshift.WildflyOpenShiftApplication; -import org.jboss.intersmash.tools.application.openshift.input.BinarySource; -import org.jboss.intersmash.tools.application.openshift.input.BuildInput; -import org.jboss.intersmash.tools.application.openshift.input.GitSource; import org.slf4j.event.Level; import cz.xtf.builder.builders.ApplicationBuilder; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyOpenShiftOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyOpenShiftOperatorProvisioner.java index ecf35f86..9d0ef090 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyOpenShiftOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyOpenShiftOperatorProvisioner.java @@ -19,7 +19,7 @@ import java.net.URL; import java.util.List; -import org.jboss.intersmash.tools.application.openshift.WildflyOperatorApplication; +import org.jboss.intersmash.tools.application.operator.WildflyOperatorApplication; import org.jboss.intersmash.tools.provision.openshift.operator.wildfly.WildFlyServer; import org.jboss.intersmash.tools.provision.openshift.operator.wildfly.WildFlyServerList; import org.jboss.intersmash.tools.provision.operator.OperatorProvisioner; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyOperatorProvisionerFactory.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyOperatorProvisionerFactory.java index bfad8456..1f5125f1 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyOperatorProvisionerFactory.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/WildflyOperatorProvisionerFactory.java @@ -16,7 +16,7 @@ package org.jboss.intersmash.tools.provision.openshift; import org.jboss.intersmash.tools.application.Application; -import org.jboss.intersmash.tools.application.openshift.WildflyOperatorApplication; +import org.jboss.intersmash.tools.application.operator.WildflyOperatorApplication; import org.jboss.intersmash.tools.provision.ProvisionerFactory; import lombok.extern.slf4j.Slf4j; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/ActiveMQOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/ActiveMQOperatorProvisioner.java index e3ad3464..909b26cc 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/ActiveMQOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/ActiveMQOperatorProvisioner.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.ActiveMQOperatorApplication; +import org.jboss.intersmash.tools.application.operator.ActiveMQOperatorApplication; import org.jboss.intersmash.tools.provision.Provisioner; import org.jboss.intersmash.tools.provision.openshift.OpenShiftProvisioner; import org.jboss.intersmash.tools.provision.openshift.operator.activemq.address.ActiveMQArtemisAddressList; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/HyperfoilOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/HyperfoilOperatorProvisioner.java index 8880164d..97f21875 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/HyperfoilOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/HyperfoilOperatorProvisioner.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.HyperfoilOperatorApplication; +import org.jboss.intersmash.tools.application.operator.HyperfoilOperatorApplication; import org.jboss.intersmash.tools.provision.Provisioner; import org.slf4j.event.Level; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/InfinispanOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/InfinispanOperatorProvisioner.java index 410bbd74..4afc4c36 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/InfinispanOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/InfinispanOperatorProvisioner.java @@ -25,7 +25,7 @@ import org.assertj.core.util.Lists; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.InfinispanOperatorApplication; +import org.jboss.intersmash.tools.application.operator.InfinispanOperatorApplication; import org.jboss.intersmash.tools.provision.Provisioner; import org.jboss.intersmash.tools.provision.openshift.operator.infinispan.cache.Cache; import org.jboss.intersmash.tools.provision.openshift.operator.infinispan.cache.CacheList; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KafkaOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KafkaOperatorProvisioner.java index ef699a3d..2d557975 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KafkaOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KafkaOperatorProvisioner.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.KafkaOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication; import org.jboss.intersmash.tools.provision.Provisioner; import org.slf4j.event.Level; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KeycloakOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KeycloakOperatorProvisioner.java index 88c53282..585328a3 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KeycloakOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KeycloakOperatorProvisioner.java @@ -24,7 +24,7 @@ import org.assertj.core.util.Lists; import org.assertj.core.util.Strings; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.KeycloakOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KeycloakOperatorApplication; import org.jboss.intersmash.tools.provision.Provisioner; import org.jboss.intersmash.tools.provision.openshift.OpenShiftProvisioner; import org.jboss.intersmash.tools.provision.openshift.WaitersUtil; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KeycloakRealmImportOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KeycloakRealmImportOperatorProvisioner.java index 888ac97b..9543e8b0 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KeycloakRealmImportOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/KeycloakRealmImportOperatorProvisioner.java @@ -27,7 +27,7 @@ import org.assertj.core.util.Lists; import org.assertj.core.util.Strings; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.KeycloakRealmImportOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KeycloakRealmImportOperatorApplication; import org.jboss.intersmash.tools.provision.Provisioner; import org.jboss.intersmash.tools.provision.openshift.WaitersUtil; import org.jboss.intersmash.tools.util.tls.CertificatesUtils; diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/WildflyOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/WildflyOperatorProvisioner.java index 376042f0..5a9ebd32 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/WildflyOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/operator/WildflyOperatorProvisioner.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; import org.jboss.intersmash.tools.IntersmashConfig; -import org.jboss.intersmash.tools.application.openshift.WildflyOperatorApplication; +import org.jboss.intersmash.tools.application.operator.WildflyOperatorApplication; import org.jboss.intersmash.tools.provision.Provisioner; import org.jboss.intersmash.tools.provision.openshift.OpenShiftProvisioner; import org.jboss.intersmash.tools.provision.openshift.WaitersUtil; diff --git a/tools/intersmash-tools-provisioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java b/tools/intersmash-tools-provisioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java index 02097730..1c5383e0 100644 --- a/tools/intersmash-tools-provisioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java +++ b/tools/intersmash-tools-provisioners/src/test/java/org/jboss/intersmash/tools/provision/ProvisionerManagerTestCase.java @@ -18,13 +18,13 @@ import static org.mockito.Mockito.mock; import org.jboss.intersmash.tools.application.Application; -import org.jboss.intersmash.tools.application.openshift.ActiveMQOperatorApplication; import org.jboss.intersmash.tools.application.openshift.BootableJarOpenShiftApplication; -import org.jboss.intersmash.tools.application.openshift.KafkaOperatorApplication; import org.jboss.intersmash.tools.application.openshift.MysqlImageOpenShiftApplication; import org.jboss.intersmash.tools.application.openshift.PostgreSQLImageOpenShiftApplication; import org.jboss.intersmash.tools.application.openshift.WildflyImageOpenShiftApplication; -import org.jboss.intersmash.tools.application.openshift.WildflyOperatorApplication; +import org.jboss.intersmash.tools.application.operator.ActiveMQOperatorApplication; +import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication; +import org.jboss.intersmash.tools.application.operator.WildflyOperatorApplication; import org.jboss.intersmash.tools.provision.openshift.ActiveMQOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.KafkaOpenShiftOperatorProvisioner; import org.jboss.intersmash.tools.provision.openshift.MysqlImageOpenShiftProvisioner;