diff --git a/README.md b/README.md index 622e24a0b..8272b874d 100644 --- a/README.md +++ b/README.md @@ -197,7 +197,9 @@ script](.ci/openshift-ci/build-root/e2e-test-prod.sh) as an example: | wildfly.ee-feature-pack.location | Used by shared configurable deployments: Wildfly/JBoss EAP 8 EE Galleon feature pack location (G:A:V) | | wildfly.feature-pack.location | Used by shared configurable deployments: Wildfly/JBoss EAP 8 Galleon feature pack location (G:A:V) | | wildfly.cloud-feature-pack.location | Used by shared configurable deployments: Wildfly/JBoss EAP 8 Cloud Galleon feature pack location (G:A:V) | -| wildfly.ee-channel.location | Used by shared configurable deployments: JBoss EAP 8 Channel artifact location (G:A:V) | +| wildfly.ee-channel.groupId | Used by shared configurable deployments: JBoss EAP 8 Channel artifact `groupId` | +| wildfly.ee-channel.artifactId | Used by shared configurable deployments: JBoss EAP 8 Channel artifact `artifactId` | +| wildfly.ee-channel.version | Used by shared configurable deployments: JBoss EAP 8 Channel artifact `version` | | bom.wildfly-ee.version | Used by shared configurable deployments: Wildfly/JBoss BOMs version | [*] - When `intersmash.skip.deploy` is set, please take into account that the prepared environment should be diff --git a/deployments/intersmash-deployments-provider/pom.xml b/deployments/intersmash-deployments-provider/pom.xml index b33ad3a74..538865db1 100644 --- a/deployments/intersmash-deployments-provider/pom.xml +++ b/deployments/intersmash-deployments-provider/pom.xml @@ -72,6 +72,10 @@ org.apache.maven maven-settings-builder + + cz.xtf + core + org.junit.jupiter diff --git a/deployments/intersmash-deployments-provider/src/main/java/org/jboss/intersmash/deployments/IntersmashDelpoyableWildflyApplication.java b/deployments/intersmash-deployments-provider/src/main/java/org/jboss/intersmash/deployments/IntersmashDelpoyableWildflyApplication.java deleted file mode 100644 index 5ebb3f2bb..000000000 --- a/deployments/intersmash-deployments-provider/src/main/java/org/jboss/intersmash/deployments/IntersmashDelpoyableWildflyApplication.java +++ /dev/null @@ -1,177 +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.deployments; - -import com.google.common.base.Strings; - -/** - * Defines the contract for WILDFLY application services that expose configuration which should be taken into account - * by the WILDFLY s2i v2 process, i.e. the WildFly Maven plugin, feature packs and BOMs settings - */ -public interface IntersmashDelpoyableWildflyApplication { - - /** - * Server version property value for BOMs - * - * @return A string that represents a valid version of testable BOMs that could be used for building a given WILDFLY - * deployment application - */ - String bomServerVersionPropertyValue(); - - /** - * Server version property name for BOMs - * - * @return A string that represents the name of a property which could hold a given WILDFLY 8 deployment application - * testable BOMs version - */ - default String bomServerVersionPropertyName() { - return "bom.wildfly-ee.version"; - } - - /** - * "wildfly-ee-galleon-pack" feature pack GAV - * - * @return "wildfly-ee-galleon-pack" feature pack GAV e.g. org.wildfly:wildfly-ee-galleon-pack:27.0.0.Alpha4 - */ - String eeFeaturePackLocation(); - - /** - * "wildfly-galleon-pack" feature pack GAV - * - * @return "wildfly-galleon-pack" feature pack GAV e.g. org.wildfly:wildfly-galleon-pack:27.0.0.Alpha4 - */ - String featurePackLocation(); - - /** - * "wildfly-cloud-galleon-pack" feature pack GAV - * - * @return "wildfly-cloud-galleon-pack" feature pack GAV e.g. org.wildfly.cloud:wildfly-cloud-galleon-pack:2.0.0.Alpha4 - */ - String cloudFeaturePackLocation(); - - /** - * channel GAV - * - * @return channel GAV - */ - String eeChannelLocation(); - - /** - * This must match the variable name in the pom.xml file used to set the "wildfly-ee-galleon-pack" feature pack GAV - * - * @return variable name in the pom.xml file used to set the feature pack GAV - */ - default String eeFeaturePackLocationVarName() { - return "wildfly.ee-feature-pack.location"; - } - - /** - * This must match the variable name in the pom.xml file used to set the "wildfly-cloud-galleon-pack" feature pack GAV - * - * @return variable name in the pom.xml file used to set the cloud feature pack GAV - */ - default String cloudFeaturePackLocationVarName() { - return "wildfly.cloud-feature-pack.location"; - } - - /** - * This must match the variable name in the pom.xml file used to set the channel GAV - * - * @return variable name in the pom.xml file used to set the channel GAV - */ - default String eeChannelLocationVarName() { - return "wildfly.ee-channel.location"; - } - - /** - * This must match the variable name in the pom.xml file used to set the channel GAV - * - * @return variable name in the pom.xml file used to set the channel GAV - */ - default String postgresFeaturePackDriverVersion() { - return "42.2.8"; - } - - /** - * @return "wildfly-maven-plugin" groupId - */ - String wildflyMavenPluginGroupId(); - - /** - * @return "wildfly-maven-plugin" artifactId - */ - String wildflyMavenPluginArtifactId(); - - /** - * @return "wildfly-maven-plugin" version - */ - String wildflyMavenPluginVersion(); - - /** - * This must match the variable name in the pom.xml file used to set the "wildfly-maven-plugin" groupId - * - * @return variable name in the pom.xml file used to set the "wildfly-maven-plugin" groupId - */ - default String wildflyMavenPluginGroupIdName() { - return "wildfly-maven-plugin.groupId"; - } - - /** - * This must match the variable name in the pom.xml file used to set the "wildfly-maven-plugin" artifactId - * - * @return variable name in the pom.xml file used to set the "wildfly-maven-plugin" artifactId - */ - default String wildflyMavenPluginArtifactIdName() { - return "wildfly-maven-plugin.artifactId"; - } - - /** - * This must match the variable name in the pom.xml file used to set the "wildfly-maven-plugin" version - * - * @return variable name in the pom.xml file used to set the "wildfly-maven-plugin" version - */ - default String wildflyMavenPluginVersionName() { - return "wildfly-maven-plugin.version"; - } - - default String generateAdditionalMavenArgs() { - String result = "".concat(((Strings.isNullOrEmpty(this.eeFeaturePackLocation()) ? "" - : (" -D" + this.eeFeaturePackLocationVarName() + "=" - + this.eeFeaturePackLocation()))) - + ((Strings.isNullOrEmpty(this.featurePackLocation()) ? "" - : (" -D" + this.featurePackLocation() + "=" - + this.featurePackLocation()))) - + ((Strings.isNullOrEmpty(this.cloudFeaturePackLocation()) ? "" - : (" -D" + this.cloudFeaturePackLocationVarName() + "=" - + this.cloudFeaturePackLocation()))) - + ((Strings.isNullOrEmpty(this.eeChannelLocation()) ? "" - : (" -D" + this.eeChannelLocationVarName() + "=" - + this.eeChannelLocation()))) - + ((Strings.isNullOrEmpty(this.wildflyMavenPluginGroupId()) ? "" - : (" -D" + this.wildflyMavenPluginGroupIdName() + "=" - + this.wildflyMavenPluginGroupId()))) - + ((Strings.isNullOrEmpty(this.wildflyMavenPluginArtifactId()) ? "" - : (" -D" + this.wildflyMavenPluginArtifactIdName() + "=" - + this.wildflyMavenPluginArtifactId()))) - + ((Strings.isNullOrEmpty(this.wildflyMavenPluginVersion()) ? "" - : (" -D" + this.wildflyMavenPluginVersionName() + "=" - + this.wildflyMavenPluginVersion()))) - + ((Strings.isNullOrEmpty(this.bomServerVersionPropertyValue()) ? "" - : (" -D" + this.bomServerVersionPropertyName() + "=" - + this.bomServerVersionPropertyValue())))); - return result; - } -} diff --git a/deployments/intersmash-deployments-provider/src/main/java/org/jboss/intersmash/deployments/WildflyDeploymentApplicationConfiguration.java b/deployments/intersmash-deployments-provider/src/main/java/org/jboss/intersmash/deployments/WildflyDeploymentApplicationConfiguration.java new file mode 100644 index 000000000..0879b5e09 --- /dev/null +++ b/deployments/intersmash-deployments-provider/src/main/java/org/jboss/intersmash/deployments/WildflyDeploymentApplicationConfiguration.java @@ -0,0 +1,208 @@ +/** + * 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.deployments; + +import com.google.common.base.Strings; + +import cz.xtf.core.config.XTFConfig; + +/** + * Defines the contract for WILDFLY application services that expose configuration which should be taken into account + * by the WILDFLY s2i v2 process, i.e. the WildFly Maven plugin, feature packs and BOMs settings + */ +public interface WildflyDeploymentApplicationConfiguration { + + String WILDFLY_EE_FEATURE_PACK_LOCATION = "wildfly.ee-feature-pack.location"; + String WILDFLY_FEATURE_PACK_LOCATION = "wildfly.feature-pack.location"; + String WILDFLY_CLOUD_FEATURE_PACK_LOCATION = "wildfly.cloud-feature-pack.location"; + String WILDFLY_EE_CHANNEL_GROUPID = "wildfly.ee-channel.groupId"; + String WILDFLY_EE_CHANNEL_ARTIFACTID = "wildfly.ee-channel.artifactId"; + String WILDFLY_EE_CHANNEL_VERSION = "wildfly.ee-channel.version"; + String WILDFLY_BOMS_EE_SERVER_VERSION = "bom.wildfly-ee.version"; + String WILDFLY_MAVEN_PLUGIN_GROUPID = "wildfly-maven-plugin.groupId"; + String WILDFLY_MAVEN_PLUGIN_ARTIFACTID = "wildfly-maven-plugin.artifactId"; + String WILDFLY_MAVEN_PLUGIN_VERSION = "wildfly-maven-plugin.version"; + String MAVEN_MIRROR_URL = "maven-mirror.url"; + + default String wildflyMavenPluginGroupId() { + return XTFConfig.get(WILDFLY_MAVEN_PLUGIN_GROUPID); + } + + default String wildflyMavenPluginArtifactId() { + return XTFConfig.get(WILDFLY_MAVEN_PLUGIN_ARTIFACTID); + } + + default String wildflyMavenPluginVersion() { + return XTFConfig.get(WILDFLY_MAVEN_PLUGIN_VERSION); + } + + default String eeFeaturePackLocation() { + return XTFConfig.get(WILDFLY_EE_FEATURE_PACK_LOCATION); + } + + default String featurePackLocation() { + return XTFConfig.get(WILDFLY_FEATURE_PACK_LOCATION); + } + + default String cloudFeaturePackLocation() { + return XTFConfig.get(WILDFLY_CLOUD_FEATURE_PACK_LOCATION); + } + + default String eeChannelGroupId() { + return XTFConfig.get(WILDFLY_EE_CHANNEL_GROUPID); + } + + default String eeChannelArtifactId() { + return XTFConfig.get(WILDFLY_EE_CHANNEL_ARTIFACTID); + } + + default String eeChannelVersion() { + return XTFConfig.get(WILDFLY_EE_CHANNEL_VERSION); + } + + default String bomsEeServerVersion() { + return XTFConfig.get(WILDFLY_BOMS_EE_SERVER_VERSION); + } + + default String getMavenMirrorUrl() { + return XTFConfig.get(MAVEN_MIRROR_URL); + } + + /** + * Server version property name for BOMs + * + * @return A string that represents the name of a property which could hold a given WILDFLY 8 deployment application + * testable BOMs version + */ + default String bomsEeServerVersionPropertyName() { + return WILDFLY_BOMS_EE_SERVER_VERSION; + } + + /** + * This must match the property name in the pom.xml file used to set the "wildfly-ee-galleon-pack" feature pack GAV + * + * @return property name in the pom.xml file used to set the feature pack GAV + */ + default String eeFeaturePackLocationPropertyName() { + return WILDFLY_FEATURE_PACK_LOCATION; + } + + /** + * This must match the property name in the pom.xml file used to set the "wildfly-cloud-galleon-pack" feature pack GAV + * + * @return property name in the pom.xml file used to set the cloud feature pack GAV + */ + default String cloudFeaturePackLocationPropertyName() { + return WILDFLY_CLOUD_FEATURE_PACK_LOCATION; + } + + /** + * This must match the property name in the pom.xml file used to set the channel GroupId + * + * @return property name in the pom.xml file used to set the channel artifact groupId + */ + default String eeChannelGroupIdPropertyName() { + return WILDFLY_EE_CHANNEL_GROUPID; + } + + /** + * This must match the property name in the pom.xml file used to set the channel ArtifactId + * + * @return property name in the pom.xml file used to set the channel artifact artifactId + */ + default String eeChannelArtifactIdPropertyName() { + return WILDFLY_EE_CHANNEL_ARTIFACTID; + } + + /** + * This must match the property name in the pom.xml file used to set the channel Version + * + * @return property name in the pom.xml file used to set the channel artifact version + */ + default String eeChannelVersionPropertyName() { + return WILDFLY_EE_CHANNEL_VERSION; + } + + /** + * This must match the property name in the pom.xml file used to set the channel GAV + * + * @return property name in the pom.xml file used to set the channel GAV + */ + default String postgresFeaturePackDriverVersion() { + return "42.2.8"; + } + + /** + * This must match the property name in the pom.xml file used to set the "wildfly-maven-plugin" groupId + * + * @return property name in the pom.xml file used to set the "wildfly-maven-plugin" groupId + */ + default String wildflyMavenPluginGroupIdPropertyName() { + return WILDFLY_MAVEN_PLUGIN_GROUPID; + } + + /** + * This must match the property name in the pom.xml file used to set the "wildfly-maven-plugin" artifactId + * + * @return property name in the pom.xml file used to set the "wildfly-maven-plugin" artifactId + */ + default String wildflyMavenPluginArtifactIdPropertyName() { + return WILDFLY_MAVEN_PLUGIN_ARTIFACTID; + } + + /** + * This must match the property name in the pom.xml file used to set the "wildfly-maven-plugin" version + * + * @return property name in the pom.xml file used to set the "wildfly-maven-plugin" version + */ + default String wildflyMavenPluginVersionPropertyName() { + return WILDFLY_MAVEN_PLUGIN_VERSION; + } + + default String generateAdditionalMavenArgs() { + String result = "".concat(((Strings.isNullOrEmpty(this.eeFeaturePackLocation()) ? "" + : (" -D" + this.eeFeaturePackLocationPropertyName() + "=" + + this.eeFeaturePackLocation()))) + + ((Strings.isNullOrEmpty(this.featurePackLocation()) ? "" + : (" -D" + this.featurePackLocation() + "=" + + this.featurePackLocation()))) + + ((Strings.isNullOrEmpty(this.cloudFeaturePackLocation()) ? "" + : (" -D" + this.cloudFeaturePackLocationPropertyName() + "=" + + this.cloudFeaturePackLocation()))) + + ((Strings.isNullOrEmpty(this.eeChannelGroupId()) ? "" + : (" -D" + this.eeChannelGroupIdPropertyName() + "=" + + this.eeChannelGroupId()))) + + ((Strings.isNullOrEmpty(this.eeChannelArtifactId()) ? "" + : (" -D" + this.eeChannelArtifactIdPropertyName() + "=" + + this.eeChannelArtifactId()))) + + ((Strings.isNullOrEmpty(this.eeChannelVersion()) ? "" + : (" -D" + this.eeChannelVersionPropertyName() + "=" + + this.eeChannelVersion()))) + + ((Strings.isNullOrEmpty(this.wildflyMavenPluginGroupId()) ? "" + : (" -D" + this.wildflyMavenPluginGroupIdPropertyName() + "=" + + this.wildflyMavenPluginGroupId()))) + + ((Strings.isNullOrEmpty(this.wildflyMavenPluginArtifactId()) ? "" + : (" -D" + this.wildflyMavenPluginArtifactIdPropertyName() + "=" + + this.wildflyMavenPluginArtifactId()))) + + ((Strings.isNullOrEmpty(this.wildflyMavenPluginVersion()) ? "" + : (" -D" + this.wildflyMavenPluginVersionPropertyName() + "=" + + this.wildflyMavenPluginVersion()))) + + ((Strings.isNullOrEmpty(this.bomsEeServerVersion()) ? "" + : (" -D" + this.bomsEeServerVersionPropertyName() + "=" + + this.bomsEeServerVersion())))); + return result; + } +} 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 3b2c77f0d..90e55877c 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,9 +28,9 @@ import java.util.Map; import org.assertj.core.util.Strings; -import org.jboss.intersmash.deployments.IntersmashDelpoyableWildflyApplication; import org.jboss.intersmash.deployments.IntersmashSharedDeployments; import org.jboss.intersmash.deployments.IntersmashSharedDeploymentsProperties; +import org.jboss.intersmash.deployments.WildflyDeploymentApplicationConfiguration; import org.jboss.intersmash.testsuite.IntersmashTestsuiteProperties; import org.jboss.intersmash.tools.IntersmashConfig; import org.jboss.intersmash.tools.application.openshift.BootableJarOpenShiftApplication; @@ -279,55 +279,12 @@ public String getName() { }; } - interface StaticWildflyImageOpenShiftApplication - extends WildflyImageOpenShiftApplication, IntersmashDelpoyableWildflyApplication { - }; - - static WildflyImageOpenShiftApplication getWildflyOpenShiftImageApplication() { - return new StaticWildflyImageOpenShiftApplication() { - - @Override - public String eeFeaturePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.ee-feature-pack.location=" - return IntersmashConfig.getWildflyEeFeaturePackLocation(); - } - - @Override - public String featurePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.feature-pack.location=" - return IntersmashConfig.getWildflyFeaturePackLocation(); - } - - @Override - public String cloudFeaturePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.cloud-feature-pack.location=" - return IntersmashConfig.getWildflyCloudFeaturePackLocation(); - } - - @Override - public String eeChannelLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.ee-channel.location=" - return IntersmashConfig.getWildflyEeChannelLocation(); - } - - @Override - public String wildflyMavenPluginGroupId() { - return IntersmashConfig.getWildflyMavenPluginGroupId(); - } - - @Override - public String wildflyMavenPluginArtifactId() { - return IntersmashConfig.getWildflyMavenPluginArtifactId(); - } + interface StaticWildflyImageOpenShiftDeploymentApplication + extends WildflyImageOpenShiftApplication, WildflyDeploymentApplicationConfiguration { + } - @Override - public String wildflyMavenPluginVersion() { - return IntersmashConfig.getWildflyMavenPluginVersion(); - } + static StaticWildflyImageOpenShiftDeploymentApplication getWildflyOpenShiftImageApplication() { + return new StaticWildflyImageOpenShiftDeploymentApplication() { @Override public List getCliScript() { @@ -349,9 +306,9 @@ public List getEnvVars() { // in org.jboss.intersmash.tools.provision.openshift.WildflyImageOpenShiftProvisioner#deployImage(). list.add(new EnvVarBuilder().withName("ADMIN_USERNAME").withValue("admin").build()); list.add(new EnvVarBuilder().withName("ADMIN_PASSWORD").withValue("pass.1234").build()); - if (!Strings.isNullOrEmpty(IntersmashConfig.getMavenMirrorUrl())) { + if (!Strings.isNullOrEmpty(this.getMavenMirrorUrl())) { list.add(new EnvVarBuilder().withName("MAVEN_MIRROR_URL") - .withValue(IntersmashConfig.getMavenMirrorUrl()).build()); + .withValue(this.getMavenMirrorUrl()).build()); } final String deploymentRelativePath = "deployments/openshift-jakarta-sample-standalone/"; @@ -387,61 +344,13 @@ public String getName() { public String getPingServiceName() { return "wildfly-ping-service"; } - - @Override - public String bomServerVersionPropertyValue() { - return IntersmashConfig.getWildflyBomsEeServerVersion(); - } }; } - public static StaticWildflyImageOpenShiftApplication getWildflyOpenShiftLocalBinarySourceApplication() { - return new StaticWildflyImageOpenShiftApplication() { + public static StaticWildflyImageOpenShiftDeploymentApplication getWildflyOpenShiftLocalBinarySourceApplication() { + return new StaticWildflyImageOpenShiftDeploymentApplication() { Path app = IntersmashSharedDeployments.findStandaloneDeploymentPath("openshift-jakarta-sample-standalone"); - @Override - public String eeFeaturePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.ee-feature-pack.location=" - return IntersmashConfig.getWildflyEeFeaturePackLocation(); - } - - @Override - public String featurePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.feature-pack.location=" - return IntersmashConfig.getWildflyFeaturePackLocation(); - } - - @Override - public String cloudFeaturePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.cloud-feature-pack.location=" - return IntersmashConfig.getWildflyCloudFeaturePackLocation(); - } - - @Override - public String eeChannelLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.ee-channel.location=" - return IntersmashConfig.getWildflyEeChannelLocation(); - } - - @Override - public String wildflyMavenPluginGroupId() { - return IntersmashConfig.getWildflyMavenPluginGroupId(); - } - - @Override - public String wildflyMavenPluginArtifactId() { - return IntersmashConfig.getWildflyMavenPluginArtifactId(); - } - - @Override - public String wildflyMavenPluginVersion() { - return IntersmashConfig.getWildflyMavenPluginVersion(); - } - @Override public List getCliScript() { return Arrays @@ -463,9 +372,9 @@ public List getEnvVars() { list.add(new EnvVarBuilder().withName("ADMIN_USERNAME").withValue("admin").build()); list.add(new EnvVarBuilder().withName("ADMIN_PASSWORD").withValue("pass.1234").build()); - if (!Strings.isNullOrEmpty(IntersmashConfig.getMavenMirrorUrl())) { + if (!Strings.isNullOrEmpty(this.getMavenMirrorUrl())) { list.add(new EnvVarBuilder().withName("MAVEN_MIRROR_URL") - .withValue(IntersmashConfig.getMavenMirrorUrl()).build()); + .withValue(this.getMavenMirrorUrl()).build()); } // let's add configurable deployment additional args: @@ -499,11 +408,6 @@ public String getPingServiceName() { return "wildfly-ping-service"; } - - @Override - public String bomServerVersionPropertyValue() { - return IntersmashConfig.getWildflyBomsEeServerVersion(); - } }; } diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplicaton.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java similarity index 63% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplicaton.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java index 6fc3b4c7a..6fdbf9897 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplicaton.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.jboss.intersmash.deployments.IntersmashDelpoyableWildflyApplication; +import org.jboss.intersmash.deployments.WildflyDeploymentApplicationConfiguration; import org.jboss.intersmash.model.helm.charts.values.wildfly.HelmWildflyRelease; import org.jboss.intersmash.tools.IntersmashConfig; import org.jboss.intersmash.tools.application.openshift.helm.HelmChartRelease; @@ -34,18 +34,18 @@ import io.fabric8.kubernetes.api.model.Secret; -public class WildflyHelmChartExistingValuesOpenShiftExampleApplicaton - implements WildflyHelmChartOpenShiftApplication, IntersmashDelpoyableWildflyApplication { +public class WildflyHelmChartExistingValuesOpenShiftExampleApplication + implements WildflyHelmChartOpenShiftApplication, WildflyDeploymentApplicationConfiguration { private static final String APP_NAME = "wildfly-helm-helloworld-qs"; private final HelmChartRelease release; private final Map setOverrides = new HashMap<>(); - public WildflyHelmChartExistingValuesOpenShiftExampleApplicaton() { + public WildflyHelmChartExistingValuesOpenShiftExampleApplication() { this.release = new HelmChartRelease(loadRelease()); } - WildflyHelmChartExistingValuesOpenShiftExampleApplicaton addSetOverride(String name, String value) { + WildflyHelmChartExistingValuesOpenShiftExampleApplication addSetOverride(String name, String value) { setOverrides.put(name, value); return this; } @@ -110,52 +110,4 @@ public String getBuilderImage() { public String getRuntimeImage() { return IntersmashConfig.wildflyRuntimeImageURL(); } - - @Override - public String bomServerVersionPropertyValue() { - return IntersmashConfig.getWildflyBomsEeServerVersion(); - } - - @Override - public String eeFeaturePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.ee-feature-pack.location=" - return IntersmashConfig.getWildflyEeFeaturePackLocation(); - } - - @Override - public String featurePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.feature-pack.location=" - return IntersmashConfig.getWildflyFeaturePackLocation(); - } - - @Override - public String cloudFeaturePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.cloud-feature-pack.location=" - return IntersmashConfig.getWildflyCloudFeaturePackLocation(); - } - - @Override - public String eeChannelLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.ee-channel.location=" - return IntersmashConfig.getWildflyEeChannelLocation(); - } - - @Override - public String wildflyMavenPluginGroupId() { - return IntersmashConfig.getWildflyMavenPluginGroupId(); - } - - @Override - public String wildflyMavenPluginArtifactId() { - return IntersmashConfig.getWildflyMavenPluginArtifactId(); - } - - @Override - public String wildflyMavenPluginVersion() { - return IntersmashConfig.getWildflyMavenPluginVersion(); - } } diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesProvisionerTest.java index b897191e1..417238303 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesProvisionerTest.java @@ -34,7 +34,7 @@ public class WildflyHelmChartExistingValuesProvisionerTest { @Test public void basicProvisioningTest() { // initialize the application service descriptor - final WildflyHelmChartExistingValuesOpenShiftExampleApplicaton application = new WildflyHelmChartExistingValuesOpenShiftExampleApplicaton(); + final WildflyHelmChartExistingValuesOpenShiftExampleApplication application = new WildflyHelmChartExistingValuesOpenShiftExampleApplication(); application .addSetOverride("build.uri", IntersmashConfig.deploymentsRepositoryUrl()) .addSetOverride("build.ref", IntersmashConfig.deploymentsRepositoryRef()) diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplicaton.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java similarity index 69% rename from testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplicaton.java rename to testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java index 820e3c0d5..e31310145 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplicaton.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java @@ -21,8 +21,8 @@ import java.util.List; import org.assertj.core.util.Strings; -import org.jboss.intersmash.deployments.IntersmashDelpoyableWildflyApplication; import org.jboss.intersmash.deployments.IntersmashSharedDeploymentsProperties; +import org.jboss.intersmash.deployments.WildflyDeploymentApplicationConfiguration; import org.jboss.intersmash.model.helm.charts.values.wildfly.Build; import org.jboss.intersmash.model.helm.charts.values.wildfly.Deploy; import org.jboss.intersmash.model.helm.charts.values.wildfly.Env; @@ -34,13 +34,13 @@ import io.fabric8.kubernetes.api.model.Secret; -public class WildflyHelmChartOpenShiftExampleApplicaton - implements WildflyHelmChartOpenShiftApplication, IntersmashDelpoyableWildflyApplication { +public class WildflyHelmChartOpenShiftExampleApplication + implements WildflyHelmChartOpenShiftApplication, WildflyDeploymentApplicationConfiguration { private static final String APP_NAME = "wildfly-helm-helloworld-qs"; private final HelmChartRelease release; - public WildflyHelmChartOpenShiftExampleApplicaton() { + public WildflyHelmChartOpenShiftExampleApplication() { this.release = new HelmChartRelease(loadRelease()); } @@ -115,52 +115,4 @@ public String getBuilderImage() { public String getRuntimeImage() { return IntersmashConfig.wildflyRuntimeImageURL(); } - - @Override - public String bomServerVersionPropertyValue() { - return IntersmashConfig.getWildflyBomsEeServerVersion(); - } - - @Override - public String eeFeaturePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.ee-feature-pack.location=" - return IntersmashConfig.getWildflyEeFeaturePackLocation(); - } - - @Override - public String featurePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.feature-pack.location=" - return IntersmashConfig.getWildflyFeaturePackLocation(); - } - - @Override - public String cloudFeaturePackLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.cloud-feature-pack.location=" - return IntersmashConfig.getWildflyCloudFeaturePackLocation(); - } - - @Override - public String eeChannelLocation() { - // this value is supposed to be overridden externally by passing e.g. - // "mvn ... -Dwildfly.ee-channel.location=" - return IntersmashConfig.getWildflyEeChannelLocation(); - } - - @Override - public String wildflyMavenPluginGroupId() { - return IntersmashConfig.getWildflyMavenPluginGroupId(); - } - - @Override - public String wildflyMavenPluginArtifactId() { - return IntersmashConfig.getWildflyMavenPluginArtifactId(); - } - - @Override - public String wildflyMavenPluginVersion() { - return IntersmashConfig.getWildflyMavenPluginVersion(); - } } 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 e63fd8028..cebf5c93f 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 @@ -34,7 +34,7 @@ public class WildflyHelmChartProvisionerTest { @Test public void basicProvisioningTest() { // initialize the application service descriptor - final WildflyHelmChartOpenShiftApplication application = new WildflyHelmChartOpenShiftExampleApplicaton(); + final WildflyHelmChartOpenShiftApplication application = new WildflyHelmChartOpenShiftExampleApplication(); // and now get an EAP 8/WildFly provisioner for that application final WildflyHelmChartOpenShiftProvisioner provisioner = new WildflyHelmChartOpenShiftProvisioner(application); // deploy 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 e5049241d..6da3dc1cb 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 @@ -46,7 +46,7 @@ @CleanBeforeAll public class WildflyMavenProjectTestCase { private static final OpenShift openShift = OpenShifts.master(); - private static final OpenShiftProvisionerTestBase.StaticWildflyImageOpenShiftApplication application = OpenShiftProvisionerTestBase + private static final OpenShiftProvisionerTestBase.StaticWildflyImageOpenShiftDeploymentApplication application = OpenShiftProvisionerTestBase .getWildflyOpenShiftLocalBinarySourceApplication(); private static final WildflyImageOpenShiftProvisioner provisioner = new WildflyImageOpenShiftProvisioner(application); diff --git a/tools/intersmash-tools-core/src/main/java/org/jboss/intersmash/tools/IntersmashConfig.java b/tools/intersmash-tools-core/src/main/java/org/jboss/intersmash/tools/IntersmashConfig.java index 3f9a0030f..6c66f236f 100644 --- a/tools/intersmash-tools-core/src/main/java/org/jboss/intersmash/tools/IntersmashConfig.java +++ b/tools/intersmash-tools-core/src/main/java/org/jboss/intersmash/tools/IntersmashConfig.java @@ -86,11 +86,6 @@ public class IntersmashConfig { // WILDFLY private static final String WILDFLY_IMAGE_URL = "intersmash.wildfly.image"; private static final String WILDFLY_RUNTIME_IMAGE_URL = "intersmash.wildfly.runtime.image"; - private static final String WILDFLY_EE_FEATURE_PACK_LOCATION = "wildfly.ee-feature-pack.location"; - private static final String WILDFLY_FEATURE_PACK_LOCATION = "wildfly.feature-pack.location"; - private static final String WILDFLY_CLOUD_FEATURE_PACK_LOCATION = "wildfly.cloud-feature-pack.location"; - private static final String WILDFLY_EE_CHANNEL_LOCATION = "wildfly.ee-channel.location"; - private static final String WILDFLY_BOMS_EE_SERVER_VERSION = "bom.wildfly-ee.version"; private static final String WILDFLY_HELM_CHARTS_REPO = "intersmash.wildfly.helm.charts.repo"; private static final String WILDFLY_HELM_CHARTS_BRANCH = "intersmash.wildfly.helm.charts.branch"; private static final String WILDFLY_HELM_CHARTS_NAME = "intersmash.wildfly.helm.charts.name"; @@ -101,12 +96,6 @@ public class IntersmashConfig { private static final String EAP7_TEMPLATES_BASE_URL = "intersmash.eap7.templates.base.url"; private static final String EAP7_TEMPLATES_PATH = "intersmash.eap7.templates.path"; - // WildFLy Maven Plugin - private static final String WILDFLY_MAVEN_PLUGIN_GROUPID = "wildfly-maven-plugin.groupId"; - private static final String WILDFLY_MAVEN_PLUGIN_ARTIFACTID = "wildfly-maven-plugin.artifactId"; - private static final String WILDFLY_MAVEN_PLUGIN_VERSION = "wildfly-maven-plugin.version"; - private static final String MAVEN_MIRROR_URL = "maven-mirror.url"; - // INFINISPAN private static final String INFINISPAN_IMAGE_URL = "intersmash.infinispan.image"; @@ -386,42 +375,6 @@ public static String deploymentsRepositoryRef() { return XTFConfig.get(DEPLOYMENTS_REPOSITORY_REF, IntersmashDeploymentsGitHelper.repositoryReference()); } - public static String getWildflyMavenPluginGroupId() { - return XTFConfig.get(WILDFLY_MAVEN_PLUGIN_GROUPID); - } - - public static String getWildflyMavenPluginArtifactId() { - return XTFConfig.get(WILDFLY_MAVEN_PLUGIN_ARTIFACTID); - } - - public static String getWildflyMavenPluginVersion() { - return XTFConfig.get(WILDFLY_MAVEN_PLUGIN_VERSION); - } - - public static String getWildflyEeFeaturePackLocation() { - return XTFConfig.get(WILDFLY_EE_FEATURE_PACK_LOCATION); - } - - public static String getWildflyFeaturePackLocation() { - return XTFConfig.get(WILDFLY_FEATURE_PACK_LOCATION); - } - - public static String getWildflyCloudFeaturePackLocation() { - return XTFConfig.get(WILDFLY_CLOUD_FEATURE_PACK_LOCATION); - } - - public static String getWildflyEeChannelLocation() { - return XTFConfig.get(WILDFLY_EE_CHANNEL_LOCATION); - } - - public static String getWildflyBomsEeServerVersion() { - return XTFConfig.get(WILDFLY_BOMS_EE_SERVER_VERSION); - } - - public static String getMavenMirrorUrl() { - return XTFConfig.get(MAVEN_MIRROR_URL); - } - public static String getWildflyHelmChartsName() { return XTFConfig.get(WILDFLY_HELM_CHARTS_NAME); }