Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[issue 146] - Fix Eap7ImageOpenShiftApplication #147

Merged
merged 1 commit into from
Feb 13, 2024
Merged

[issue 146] - Fix Eap7ImageOpenShiftApplication #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ...c/main/java/org/jboss/intersmash/application/openshift/Eap7ImageOpenShiftApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.jboss.intersmash.application.openshift.input.BinarySourceBuilder;
import org.jboss.intersmash.application.openshift.input.BuildInput;
import org.jboss.intersmash.application.openshift.input.BuildInputBuilder;
import org.jboss.intersmash.application.openshift.input.GitSourceBuilder;
import org.jboss.intersmash.provision.openshift.Eap7ImageOpenShiftProvisioner;

import cz.xtf.builder.builders.pod.PersistentVolumeClaim;
import cz.xtf.builder.builders.pod.VolumeMount;
import io.fabric8.kubernetes.api.model.EnvVar;

/**
Expand All @@ -35,7 +39,7 @@
* <li>{@link Eap7ImageOpenShiftProvisioner}</li>
* </ul>
*/
public interface Eap7ImageOpenShiftApplication extends WildflyImageOpenShiftApplication, HasEnvVars {
public interface Eap7ImageOpenShiftApplication extends WildflyOpenShiftApplication, HasEnvVars {

/**
* Use the {@link BuildInputBuilder} to get instances
Expand All @@ -47,6 +51,14 @@ public interface Eap7ImageOpenShiftApplication extends WildflyImageOpenShiftAppl
*/
BuildInput getBuildInput();

/**
* Setup mount points to EAP 7 pod and persistent volume claims to be created.
* @return A {@link Map} instance storing PVCs needed by the EAP 7 application service
*/
default Map<PersistentVolumeClaim, Set<VolumeMount>> getPersistentVolumeClaimMounts() {
return Collections.emptyMap();
}

@Override
default List<EnvVar> getEnvVars() {
return Collections.emptyList();
Expand Down
5 changes: 5 additions & 0 deletions ...t/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import java.util.stream.Stream;

import org.jboss.intersmash.provision.openshift.Eap7ImageOpenShiftProvisioner;
import org.jboss.intersmash.provision.openshift.Eap7LegacyS2iBuildTemplateProvisioner;
import org.jboss.intersmash.provision.openshift.MysqlImageOpenShiftProvisioner;
import org.jboss.intersmash.provision.openshift.OpenShiftProvisioner;
Expand Down Expand Up @@ -55,8 +56,12 @@ private static Stream<OpenShiftProvisioner> provisionerProvider() {
OpenShiftProvisionerTestBase.getPostgreSQLTemplateOpenShiftApplication()));
} else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) {
return Stream.of(
// EAP latest GA
new WildflyImageOpenShiftProvisioner(
OpenShiftProvisionerTestBase.getWildflyOpenShiftLocalBinaryTargetServerApplication()),
// EAP 7
new Eap7ImageOpenShiftProvisioner(OpenShiftProvisionerTestBase.getEap7OpenShiftImageApplication()),
// RHSSO
new RhSsoTemplateOpenShiftProvisioner(OpenShiftProvisionerTestBase.getHttpsRhSso()));
} else {
throw new IllegalStateException(
Expand Down
Loading