From bc04b502c212fe103a71700679885e45d81d7a45 Mon Sep 17 00:00:00 2001 From: Fabio Burzigotti Date: Mon, 20 Jan 2025 10:48:31 +0100 Subject: [PATCH] [issue-122] - Fix paaaassing profiles to OCP builds --- .../provision/openshift/OpenShiftProvisionerTestBase.java | 4 ++-- ...flyHelmChartExistingValuesOpenShiftExampleApplication.java | 2 +- .../WildflyHelmChartOpenShiftExampleApplication.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java index afe132d0..894b0bb9 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java @@ -351,7 +351,7 @@ public List getEnvVars() { mavenAdditionalArgs = mavenAdditionalArgs.concat( (Strings.isNullOrEmpty(deploymentStream) ? "" : String.format(" -Pts.%s-stream.", getWildflyDeploymentVariantFromStream(deploymentStream)) - + deploymentStream)); + + deploymentStream)); } list.add(new EnvVarBuilder().withName("MAVEN_ARGS_APPEND").withValue(mavenAdditionalArgs).build()); list.add(new EnvVarBuilder().withName("MAVEN_S2I_ARTIFACT_DIRS").withValue(deploymentRelativePath + "target") @@ -422,7 +422,7 @@ public List getEnvVars() { mavenAdditionalArgs = mavenAdditionalArgs.concat( (Strings.isNullOrEmpty(deploymentStream) ? "" : String.format(" -Pts.%s-stream.", getWildflyDeploymentVariantFromStream(deploymentStream)) - + deploymentStream)); + + deploymentStream)); } if (!Strings.isNullOrEmpty(mavenAdditionalArgs)) { list.add(new EnvVarBuilder().withName("MAVEN_ARGS_APPEND").withValue(mavenAdditionalArgs).build()); diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java index 4474486a..bde15d88 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java @@ -122,7 +122,7 @@ else if (TestDeploymentProperties.isEapXp6DeploymentsBuildStreamEnabled()) { mavenAdditionalArgs = mavenAdditionalArgs.concat( (Strings.isNullOrEmpty(deploymentStream) ? "" : String.format(" -Pts.%s-stream.", getWildflyDeploymentVariantFromStream(deploymentStream)) - + deploymentStream)); + + deploymentStream)); } return wildflyHelmChartRelease; } diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java index e1de0d48..7ccc20f0 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java @@ -83,7 +83,7 @@ private HelmChartRelease loadRelease(final WildflyHelmChartRelease release) { mavenAdditionalArgs = mavenAdditionalArgs.concat( (Strings.isNullOrEmpty(deploymentStream) ? "" : String.format(" -Pts.%s-stream.", getWildflyDeploymentVariantFromStream(deploymentStream)) - + deploymentStream)); + + deploymentStream)); } // ok, let's configure the release via the WildflyHelmChartRelease fluent(-ish) API, // which offers a common reference for both WildFly and EAP (latest)