diff --git a/README.md b/README.md index b4cf5b83f..de92f802e 100644 --- a/README.md +++ b/README.md @@ -279,7 +279,7 @@ extended easily, since Intersmash _provisioners_ are pluggable components. | Product | Supported Operator version | Channel name | Supported product version | Repository | Notes | |:--------------------------|:---------------------------|:-------------|:--------------------------|:----------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Hyperfoil | 0.21.0 | alpha | 0.23 | https://github.com/Hyperfoil/hyperfoil-operator | | +| Hyperfoil | 0.24.2 | alpha | 0.24.2 | https://github.com/Hyperfoil/hyperfoil-operator | We force the CRs version for the used Hyperfoil runtime to be 0.24.2, see https://github.com/Hyperfoil/hyperfoil-operator/issues/18 | | Infinispan | 2.3.1 | 2.3.x | 14.0.6.Final | https://github.com/infinispan/infinispan-operator | | | WildFly | 0.5.6 | alpha | 27.0.1.Final | https://github.com/wildfly/wildfly-operator | As available on https://operatorhub.io/operator/wildfly | | Kafka provided by Strimzi | 0.37.0-SNAPSHOT | stable | 3.5.1 | https://github.com/strimzi/strimzi-kafka-operator | A snashot version of Strimzi API is used in order to be compatible with Fabric8 Kubernetes client artifacts | diff --git a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/HyperfoilOperatorProvisionerTest.java b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/HyperfoilOperatorProvisionerTest.java index 80852bf4d..8470aefb4 100644 --- a/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/HyperfoilOperatorProvisionerTest.java +++ b/testsuite/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/HyperfoilOperatorProvisionerTest.java @@ -35,7 +35,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -51,7 +50,6 @@ @CleanBeforeAll @NotForProductizedExecutionProfile @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -@Disabled("https://github.com/Intersmash/intersmash/issues/78") public class HyperfoilOperatorProvisionerTest { private static final Logger logger = LoggerFactory.getLogger(HyperfoilOperatorProvisionerTest.class); private static final String NAME = "hyperfoil"; @@ -62,8 +60,11 @@ private static HyperfoilOperatorProvisioner initializeOperatorProvisioner() { new HyperfoilOperatorApplication() { @Override public Hyperfoil getHyperfoil() { - return new HyperfoilBuilder(getName()) - .build(); + return new HyperfoilBuilder( + getName(), + // see https://github.com/Hyperfoil/hyperfoil-operator/issues/18, "latest" (default) would fail. + "0.24.2" + ).build(); } @Override diff --git a/testsuite/src/test/resources/k8s-hello-world.hf.yaml b/testsuite/src/test/resources/k8s-hello-world.hf.yaml index 750bab764..45940bd70 100644 --- a/testsuite/src/test/resources/k8s-hello-world.hf.yaml +++ b/testsuite/src/test/resources/k8s-hello-world.hf.yaml @@ -1,12 +1,17 @@ name: k8s-hello-world +# List of agents the Controller should deploy agents: - agent-one: + # This defines the agent using SSH connection to localhost, port 22 + agent-one: localhost:22 + # Another agent on localhost, this time defined using properties agent-two: + host: localhost + port: 22 http: host: !param HOST_URL -duration: 120s usersPerSec: 2 +duration: 120s scenario: -- test: - - httpRequest: - GET: / + - test: + - httpRequest: + GET: / \ No newline at end of file diff --git a/tools/intersmash-tools-provisioners/src/main/java/io/hyperfoil/v1alpha2/HyperfoilBuilder.java b/tools/intersmash-tools-provisioners/src/main/java/io/hyperfoil/v1alpha2/HyperfoilBuilder.java index 920f48ca4..47decdaaa 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/io/hyperfoil/v1alpha2/HyperfoilBuilder.java +++ b/tools/intersmash-tools-provisioners/src/main/java/io/hyperfoil/v1alpha2/HyperfoilBuilder.java @@ -18,7 +18,8 @@ import io.fabric8.kubernetes.api.model.ObjectMeta; public final class HyperfoilBuilder { - private String name; + private final String name; + private final String version; //TODO: complete with all hyperfoil ino @@ -27,8 +28,9 @@ public final class HyperfoilBuilder { * * @param name resource object name */ - public HyperfoilBuilder(String name) { + public HyperfoilBuilder(final String name, final String version) { this.name = name; + this.version = version; } public Hyperfoil build() { @@ -37,6 +39,7 @@ public Hyperfoil build() { hyperfoil.getMetadata().setName(name); HyperfoilSpec spec = new HyperfoilSpec(); + spec.setVersion(version); hyperfoil.setSpec(spec); return hyperfoil;