[issue 62] - Removing stuff from global-test.properties, temporarily …

…to the ci PROD script

.ci/openshift-ci/build-root/e2e-test-prod.sh

@@ -97,11 +97,21 @@ cat test.properties
 mkdir local-repo
 mvn clean install -Dmaven.repo.local=./local-repo -DskipTests -Pwildfly-deployments-build.eap
 mvn test -Dmaven.repo.local=./local-repo -pl testsuite/ \
- -Dintersmash.wildfly.image=registry.redhat.io/jboss-eap-8-tech-preview/eap8-openjdk17-builder-openshift-rhel8:1.0.0.Beta \
- -Dintersmash.wildfly.runtime.image=registry.redhat.io/jboss-eap-8-tech-preview/eap8-openjdk17-runtime-openshift-rhel8:1.0.0.Beta \
- -Dintersmash.keycloak.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:latest \
- -Dintersmash.infinispan.image=registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:latest \
- -Dintersmash.activemq.image=registry.redhat.io/amq7/amq-broker-rhel8:7.11.0 \
- -Dintersmash.wildfly.helm.charts.repo=https://github.com/jbossas/eap-charts.git \
- -Dintersmash.wildfly.helm.charts.branch=eap8-dev \
- -Dintersmash.wildfly.helm.charts.name=eap8 \
+ -Dintersmash.wildfly.image=quay.io/wildfly/wildfly-s2i-jdk17:latest
+ -Dintersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime-jdk17:latest \
+ -Dintersmash.wildfly.operators.catalog_source=community-operators-wildfly-operator \
+ -Dintersmash.wildfly.operators.index_image=quay.io/operatorhubio/catalog:latest \
+ -Dintersmash.wildfly.operators.package_manifest=wildfly \
+ -Dintersmash.wildfly.operators.channel=alpha \
+ -Dintersmash.wildfly.helm.charts.repo=https://github.com/wildfly/wildfly-charts.git \
+ -Dintersmash.wildfly.helm.charts.branch=wildfly-2.3.2 \
+ -Dintersmash.wildfly.helm.charts.name=wildfly \
+ -Dintersmash.activemq.operators.catalog_source=intersmash-activemq-operator-index \
+ -Dintersmash.activemq.operators.index_image=quay.io/jbossqe-eap/intersmash-activemq-operator-catalog:v1.0.11 \
+ -Dintersmash.activemq.operators.package_manifest=activemq-artemis-operator \
+ -Dintersmash.activemq.operators.channel=upstream \
+ -Dintersmash.kafka.operators.channel=strimzi-0.29.x \
+ -Dintersmash.keycloak.realm_import.image=quay.io/keycloak/keycloak:21.1.1 \
+ -Dintersmash.keycloak.realm_import.operators.catalog_source=community-operators \
+ -Dintersmash.keycloak.realm_import.operators.index_image=registry.redhat.io/redhat/community-operator-index:v4.12 \
+ -Dintersmash.keycloak.realm_import.operators.channel=fast

global-test.properties

@@ -12,38 +12,8 @@ xtf.junit.prebuilder.synchronized=true
 # Bootable JAR OpenJDK base image
 intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17
 
-# WildFly operator settings
-intersmash.wildfly.operators.catalog_source=community-operators-wildfly-operator
-intersmash.wildfly.operators.index_image=quay.io/operatorhubio/catalog:latest
-intersmash.wildfly.operators.package_manifest=wildfly
-intersmash.wildfly.operators.channel=alpha
-
-# Wildfly images
-intersmash.wildfly.image=quay.io/wildfly/wildfly-s2i-jdk17:latest
-intersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime-jdk17:latest
-
-# Wildfly Helm Charts
-intersmash.wildfly.helm.charts.repo=https://github.com/wildfly/wildfly-charts.git
-intersmash.wildfly.helm.charts.branch=wildfly-2.3.2
-intersmash.wildfly.helm.charts.name=wildfly
-
-# ActiveMQ operator settings
-# NOTE: we are using http://quay.io/jbossqe-eap for hosting our custom operator-catalog and operator-bundle images
-#       see https://github.com/Intersmash/intersmash/issues/32 for context
-intersmash.activemq.operators.catalog_source=intersmash-activemq-operator-index
-intersmash.activemq.operators.index_image=quay.io/jbossqe-eap/intersmash-activemq-operator-catalog:v1.0.11
-intersmash.activemq.operators.package_manifest=activemq-artemis-operator
-intersmash.activemq.operators.channel=upstream
-
-# Kafka operator settings
-intersmash.kafka.operators.channel=strimzi-0.29.x
-
 # DB
 intersmash.mysql.image=quay.io/centos7/mysql-80-centos7
 intersmash.postgresql.image=quay.io/centos7/postgresql-13-centos7
 
-# Keycloak (new Quarkus based version) settings
-#intersmash.keycloak.realm_import.image=quay.io/keycloak/keycloak:21.1.1
-#intersmash.keycloak.realm_import.operators.catalog_source=community-operators
-#intersmash.keycloak.realm_import.operators.index_image=registry.redhat.io/redhat/community-operator-index:v4.12
-#intersmash.keycloak.realm_import.operators.channel=fast
+

testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java

@@ -205,7 +205,8 @@ public List<EnvVar> getEnvVars() {
 				// let's pass the profile for building the deployment too...
 				mavenAdditionalArgs = mavenAdditionalArgs.concat(
 						(Strings.isNullOrEmpty(IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()) ? ""
-								: " -Pwildfly-deployments-build." + IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()));
+								: " -Pwildfly-deployments-build."
+										+ IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()));
 				list.add(new EnvVarBuilder().withName("MAVEN_ARGS_APPEND").withValue(mavenAdditionalArgs).build());
 				list.add(new EnvVarBuilder().withName("ARTIFACT_DIR").withValue(deploymentRelativePath + "target").build());
 
@@ -307,7 +308,8 @@ public List<EnvVar> getEnvVars() {
 				// let's pass the profile for building the deployment too...
 				mavenAdditionalArgs = mavenAdditionalArgs.concat(
 						(Strings.isNullOrEmpty(IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()) ? ""
-								: " -Pwildfly-deployments-build." + IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()));
+								: " -Pwildfly-deployments-build."
+										+ IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()));
 				if (!Strings.isNullOrEmpty(mavenAdditionalArgs)) {
 					list.add(new EnvVarBuilder().withName("MAVEN_ARGS_APPEND").withValue(mavenAdditionalArgs).build());
 				}

testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplicaton.java

@@ -53,7 +53,8 @@ private HelmWildflyRelease loadRelease() {
 		// let's pass the profile for building the deployment too...
 		mavenAdditionalArgs = mavenAdditionalArgs.concat(
 				(Strings.isNullOrEmpty(IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()) ? ""
-						: " -Pwildfly-deployments-build." + IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()));
+						: " -Pwildfly-deployments-build."
+								+ IntersmashSharedDeploymentsProperties.getWildflyDeploymentsBuildProfile()));
 		// ok, let's configure the release via the fluent(-ish) API
 		List<Env> environmentVariables = new ArrayList();
 		release