- * 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. - */ - // Establish version and status ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name @@ -43,9 +32,9 @@ subprojects { apply from: "$rootDir/dependencies.gradle" apply from: "$rootDir/springboot-bom-overrides.gradle" +apply from: "$rootDir/deploy.gradle" allprojects { - apply plugin: 'nebula.netflixoss' apply plugin: 'io.spring.dependency-management' apply plugin: 'java-library' apply plugin: 'project-report' @@ -53,7 +42,7 @@ allprojects { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 - group = 'com.netflix.conductor' + group = 'org.conductoross' configurations.all { exclude group: 'ch.qos.logback', module: 'logback-classic' @@ -111,14 +100,6 @@ allprojects { } } -jacocoTestReport { - reports { - html.required = true - xml.required = true - csv.required = false - } -} - task server { dependsOn ':conductor-server:bootRun' } diff --git a/dependencies.gradle b/dependencies.gradle index 30625c0be..ed1c08fa1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -31,7 +31,7 @@ ext { revGrpc = '1.57.2' revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' - revHealth = '1.1.+' + revHealth = '1.1.4' revProtoBuf = '3.21.12' revJakartaAnnotation = '2.1.1' revJAXB = '4.0.1' diff --git a/dependencies.lock b/dependencies.lock index fd0cb733b..545a15902 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -21,16 +21,6 @@ "locked": "2.20.0" } }, - "jacocoAgent": { - "org.jacoco:org.jacoco.agent": { - "locked": "0.8.8" - } - }, - "jacocoAnt": { - "org.jacoco:org.jacoco.ant": { - "locked": "0.8.8" - } - }, "runtimeClasspath": { "org.apache.logging.log4j:log4j-api": { "locked": "2.20.0" diff --git a/deploy.gradle b/deploy.gradle new file mode 100644 index 000000000..ebd0d240c --- /dev/null +++ b/deploy.gradle @@ -0,0 +1,77 @@ + +subprojects { + + apply plugin: 'maven-publish' + apply plugin: 'java-library' + apply plugin: 'signing' + + group = 'org.conductoross' + + java { + withSourcesJar() + withJavadocJar() + } + + publishing { + publications { + mavenJava(MavenPublication) { + from components.java + versionMapping { + usage('java-api') { + fromResolutionOf('runtimeClasspath') + } + usage('java-runtime') { + fromResolutionResult() + } + } + pom { + name = 'Conductor OSS' + description = 'Conductor OSS build.' + url = 'https://github.com/conductor-oss/conductor' + scm { + connection = 'scm:git:git://github.com/conductor-oss/conductor.git' + developerConnection = 'scm:git:ssh://github.com/conductor-oss/conductor.git' + url = 'https://github.com/conductor-oss/conductor' + } + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + developers { + developer { + organization = 'Conductor OSS' + organizationUrl = 'https://conductor-oss.org/' + name = 'Conductor OSS' + } + } + } + } + } + + repositories { + maven { + url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" + credentials { + username project.properties.username + password project.properties.password + } + } + } + } + + signing { + def signingKeyId = findProperty('signingKeyId') + if (signingKeyId) { + def signingKey = findProperty('signingKey') + def signingPassword = findProperty('signingPassword') + if (signingKeyId && signingKey && signingPassword) { + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) + } + sign publishing.publications + } + + } + +} \ No newline at end of file diff --git a/es6-persistence/build.gradle b/es6-persistence/build.gradle index c4a16081a..0db11f22a 100644 --- a/es6-persistence/build.gradle +++ b/es6-persistence/build.gradle @@ -37,6 +37,6 @@ dependencies { switch (org.gradle.internal.os.OperatingSystem.current()) { case org.gradle.internal.os.OperatingSystem.MAC_OS: - //tasks.forEach(task -> task.onlyIf { project.hasProperty('ES6Test') }) + tasks.forEach(task -> task.onlyIf { project.hasProperty('ES6Test') }) break; } diff --git a/java-sdk/src/test/resources/application-integrationtest.properties b/java-sdk/src/test/resources/application-integrationtest.properties index 6025e57a9..efb46697d 100644 --- a/java-sdk/src/test/resources/application-integrationtest.properties +++ b/java-sdk/src/test/resources/application-integrationtest.properties @@ -14,6 +14,8 @@ # conductor.db.type=memory +# disable trying to connect to redis and use in-memory +conductor.queue.type=xxx conductor.workflow-execution-lock.type=local_only conductor.external-payload-storage.type=mock conductor.indexing.enabled=false diff --git a/kafka/build.gradle b/kafka/build.gradle index 13339d752..847a9ba5d 100644 --- a/kafka/build.gradle +++ b/kafka/build.gradle @@ -26,5 +26,6 @@ dependencies { testImplementation project(':conductor-test-util') testImplementation project(':conductor-test-util').sourceSets.test.output + testImplementation "redis.clients:jedis:${revJedis}" } diff --git a/kafka/src/test/resources/application-integrationtest.properties b/kafka/src/test/resources/application-integrationtest.properties index 19e39ec47..a6432a1af 100644 --- a/kafka/src/test/resources/application-integrationtest.properties +++ b/kafka/src/test/resources/application-integrationtest.properties @@ -14,6 +14,8 @@ # conductor.db.type=memory +# disable trying to connect to redis and use in-memory +conductor.queue.type=xxx conductor.workflow-execution-lock.type=local_only conductor.external-payload-storage.type=dummy conductor.indexing.enabled=false diff --git a/mysql-persistence/build.gradle b/mysql-persistence/build.gradle index dccdfc32f..267dbee4f 100644 --- a/mysql-persistence/build.gradle +++ b/mysql-persistence/build.gradle @@ -33,7 +33,7 @@ dependencies { testImplementation project(':conductor-test-util').sourceSets.test.output testImplementation project(':conductor-common-persistence').sourceSets.test.output - + testImplementation "redis.clients:jedis:${revJedis}" } test { diff --git a/postgres-persistence/build.gradle b/postgres-persistence/build.gradle index 66155a5d6..acc925b51 100644 --- a/postgres-persistence/build.gradle +++ b/postgres-persistence/build.gradle @@ -29,6 +29,7 @@ dependencies { testImplementation project(':conductor-test-util').sourceSets.test.output testImplementation project(':conductor-common-persistence').sourceSets.test.output + testImplementation "redis.clients:jedis:${revJedis}" } diff --git a/test-harness/build.gradle b/test-harness/build.gradle index ea410db62..c250eddf6 100644 --- a/test-harness/build.gradle +++ b/test-harness/build.gradle @@ -7,7 +7,7 @@ dependencies { testImplementation project(':conductor-core') testImplementation project(':conductor-redis-persistence') testImplementation project(':conductor-cassandra-persistence') - testImplementation project(':conductor-es6-persistence') + testImplementation project(':conductor-es7-persistence') testImplementation project(':conductor-grpc-server') testImplementation project(':conductor-client') testImplementation project(':conductor-grpc-client') @@ -32,8 +32,8 @@ dependencies { testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" - testImplementation "org.elasticsearch.client:elasticsearch-rest-client:6.8.23" - testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.23" + testImplementation "org.elasticsearch.client:elasticsearch-rest-client:${revElasticSearch7}" + testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${revElasticSearch7}" testImplementation "org.testcontainers:elasticsearch:${revTestContainer}" testImplementation('junit:junit:4.13.2') diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/base/AbstractResiliencySpecification.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/base/AbstractResiliencySpecification.groovy index 0ad2a7f87..de0385f75 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/base/AbstractResiliencySpecification.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/base/AbstractResiliencySpecification.groovy @@ -14,14 +14,42 @@ package com.netflix.conductor.test.base import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty +import org.springframework.boot.test.context.SpringBootTest import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.ComponentScan import org.springframework.context.annotation.Configuration +import org.springframework.context.annotation.FilterType import org.springframework.context.annotation.Primary import org.springframework.test.context.TestPropertySource +import com.netflix.conductor.ConductorTestApp +import com.netflix.conductor.core.config.SchedulerConfiguration +import com.netflix.conductor.core.events.DefaultEventProcessor +import com.netflix.conductor.core.events.DefaultEventQueueManager +import com.netflix.conductor.core.events.queue.ConductorEventQueueProvider +import com.netflix.conductor.core.execution.mapper.DoWhileTaskMapper +import com.netflix.conductor.core.execution.mapper.EventTaskMapper +import com.netflix.conductor.core.execution.mapper.ForkJoinDynamicTaskMapper +import com.netflix.conductor.core.execution.mapper.ForkJoinTaskMapper +import com.netflix.conductor.core.execution.mapper.HumanTaskMapper +import com.netflix.conductor.core.execution.mapper.JoinTaskMapper +import com.netflix.conductor.core.execution.mapper.SimpleTaskMapper +import com.netflix.conductor.core.execution.mapper.SubWorkflowTaskMapper +import com.netflix.conductor.core.execution.mapper.SwitchTaskMapper +import com.netflix.conductor.core.execution.mapper.WaitTaskMapper +import com.netflix.conductor.core.execution.tasks.DoWhile +import com.netflix.conductor.core.execution.tasks.Event +import com.netflix.conductor.core.execution.tasks.ExclusiveJoin +import com.netflix.conductor.core.execution.tasks.Human +import com.netflix.conductor.core.execution.tasks.Inline +import com.netflix.conductor.core.execution.tasks.Join +import com.netflix.conductor.core.execution.tasks.SetVariable +import com.netflix.conductor.core.execution.tasks.SubWorkflow +import com.netflix.conductor.core.execution.tasks.Wait import com.netflix.conductor.dao.QueueDAO import com.netflix.conductor.redis.dao.DynoQueueDAO import com.netflix.conductor.redis.jedis.JedisMock +import com.netflix.conductor.tasks.json.JsonJqTransform import com.netflix.dyno.connectionpool.Host import com.netflix.dyno.queues.ShardSupplier import com.netflix.dyno.queues.redis.RedisQueues @@ -33,7 +61,8 @@ import spock.mock.DetachedMockFactory "conductor.system-task-workers.enabled=false", "conductor.workflow-repair-service.enabled=true", "conductor.workflow-reconciler.enabled=false", - "conductor.integ-test.queue-spy.enabled=true" + "conductor.integ-test.queue-spy.enabled=true", + "conductor.queue.type=xxx" ]) abstract class AbstractResiliencySpecification extends AbstractSpecification { diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/base/AbstractSpecification.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/base/AbstractSpecification.groovy index 974f30001..9aef149d9 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/base/AbstractSpecification.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/base/AbstractSpecification.groovy @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.TestPropertySource +import com.netflix.conductor.ConductorTestApp import com.netflix.conductor.core.execution.AsyncSystemTaskExecutor import com.netflix.conductor.core.execution.StartWorkflowInput import com.netflix.conductor.core.execution.WorkflowExecutor @@ -27,8 +28,11 @@ import com.netflix.conductor.test.util.WorkflowTestUtil import spock.lang.Specification -@SpringBootTest -@TestPropertySource(locations = "classpath:application-integrationtest.properties") +@SpringBootTest(classes = ConductorTestApp.class) +@TestPropertySource(locations = "classpath:application-integrationtest.properties",properties = [ + "conductor.db.type=memory", + "conductor.queue.type=xxx" +]) abstract class AbstractSpecification extends Specification { @Autowired diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy index d594fbfeb..fd27be739 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy @@ -13,7 +13,10 @@ package com.netflix.conductor.test.integration import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.TestPropertySource +import com.netflix.conductor.ConductorTestApp import com.netflix.conductor.common.metadata.tasks.Task import com.netflix.conductor.common.metadata.tasks.TaskDef import com.netflix.conductor.common.metadata.tasks.TaskResult @@ -31,6 +34,10 @@ import spock.lang.Shared import static com.netflix.conductor.test.util.WorkflowTestUtil.verifyPolledAndAcknowledgedTask +@TestPropertySource(properties = [ + "conductor.db.type=memory", + "conductor.queue.type=xxx" +]) class WorkflowAndTaskConfigurationSpec extends AbstractSpecification { @Autowired diff --git a/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java b/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java index c110e6730..66b883022 100644 --- a/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java @@ -48,7 +48,11 @@ import static org.junit.Assert.assertNotNull; @TestPropertySource( - properties = {"conductor.indexing.enabled=true", "conductor.elasticsearch.version=6"}) + properties = { + "conductor.indexing.enabled=true", + "conductor.elasticsearch.version=7", + "conductor.queue.type=xxx" + }) public abstract class AbstractEndToEndTest { private static final Logger log = LoggerFactory.getLogger(AbstractEndToEndTest.class); @@ -62,7 +66,7 @@ public abstract class AbstractEndToEndTest { private static final ElasticsearchContainer container = new ElasticsearchContainer( DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") - .withTag("6.8.17")); // this should match the client version + .withTag("7.10.2")); // this should match the client version private static RestClient restClient; diff --git a/test-harness/src/test/java/com/netflix/conductor/test/integration/grpc/AbstractGrpcEndToEndTest.java b/test-harness/src/test/java/com/netflix/conductor/test/integration/grpc/AbstractGrpcEndToEndTest.java index 96ea7783f..0c4de90a6 100644 --- a/test-harness/src/test/java/com/netflix/conductor/test/integration/grpc/AbstractGrpcEndToEndTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/test/integration/grpc/AbstractGrpcEndToEndTest.java @@ -22,6 +22,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; +import com.netflix.conductor.ConductorTestApp; import com.netflix.conductor.client.grpc.EventClient; import com.netflix.conductor.client.grpc.MetadataClient; import com.netflix.conductor.client.grpc.TaskClient; @@ -48,6 +49,7 @@ @RunWith(SpringRunner.class) @SpringBootTest( + classes = ConductorTestApp.class, properties = {"conductor.grpc-server.enabled=true", "conductor.grpc-server.port=8092"}) @TestPropertySource(locations = "classpath:application-integrationtest.properties") public abstract class AbstractGrpcEndToEndTest extends AbstractEndToEndTest { @@ -156,7 +158,7 @@ public void testAll() throws Exception { assertNotNull(polled); assertEquals(0, polled.size()); - polled = taskClient.batchPollTasksByTaskType(t0.getName(), "test", 1, 100); + polled = taskClient.batchPollTasksByTaskType(t0.getName(), "test", 1, 1000); assertNotNull(polled); assertEquals(1, polled.size()); assertEquals(t0.getName(), polled.get(0).getTaskDefName()); diff --git a/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java b/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java index b57066c01..279e38c5f 100644 --- a/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java @@ -26,6 +26,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; +import com.netflix.conductor.ConductorTestApp; import com.netflix.conductor.client.exception.ConductorClientException; import com.netflix.conductor.client.http.EventClient; import com.netflix.conductor.client.http.MetadataClient; @@ -55,7 +56,7 @@ import static org.junit.Assert.fail; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = ConductorTestApp.class) @TestPropertySource(locations = "classpath:application-integrationtest.properties") public abstract class AbstractHttpEndToEndTest extends AbstractEndToEndTest { diff --git a/test-harness/src/test/resources/application-integrationtest.properties b/test-harness/src/test/resources/application-integrationtest.properties index af1517070..b209c8054 100644 --- a/test-harness/src/test/resources/application-integrationtest.properties +++ b/test-harness/src/test/resources/application-integrationtest.properties @@ -14,6 +14,8 @@ # conductor.db.type=memory +# disable trying to connect to redis and use in-memory +conductor.queue.type=xxx conductor.workflow-execution-lock.type=local_only conductor.external-payload-storage.type=mock conductor.indexing.enabled=false diff --git a/test-util/build.gradle b/test-util/build.gradle index b9fe3754b..b3280ca51 100644 --- a/test-util/build.gradle +++ b/test-util/build.gradle @@ -6,7 +6,7 @@ dependencies { implementation project(':conductor-common') implementation project(':conductor-core') - implementation project(':conductor-server') + compileOnly project(':conductor-server') implementation project(':conductor-client') implementation project(':conductor-rest') implementation project(':conductor-grpc-server') @@ -18,6 +18,7 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-core" implementation "org.apache.commons:commons-lang3" implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.retry:spring-retry' implementation "com.fasterxml.jackson.core:jackson-databind" implementation "com.fasterxml.jackson.core:jackson-core" @@ -46,6 +47,7 @@ dependencies { //In memory implementation "org.rarefiedredis.redis:redis-java:${revRarefiedRedis}" + } test { diff --git a/test-util/src/test/groovy/com/netflix/conductor/test/base/AbstractSpecification.groovy b/test-util/src/test/groovy/com/netflix/conductor/test/base/AbstractSpecification.groovy index 2fde6d4f6..2f59d9d60 100644 --- a/test-util/src/test/groovy/com/netflix/conductor/test/base/AbstractSpecification.groovy +++ b/test-util/src/test/groovy/com/netflix/conductor/test/base/AbstractSpecification.groovy @@ -12,6 +12,7 @@ */ package com.netflix.conductor.test.base +import com.netflix.conductor.ConductorTestApp import com.netflix.conductor.service.WorkflowService import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest @@ -26,7 +27,7 @@ import com.netflix.conductor.test.util.WorkflowTestUtil import spock.lang.Specification -@SpringBootTest +@SpringBootTest(classes = ConductorTestApp.class) @TestPropertySource(locations = "classpath:application-integrationtest.properties") abstract class AbstractSpecification extends Specification { diff --git a/test-util/src/test/java/com/netflix/conductor/test/integration/grpc/AbstractGrpcEndToEndTest.java b/test-util/src/test/java/com/netflix/conductor/test/integration/grpc/AbstractGrpcEndToEndTest.java index 5f53592bb..5d43ef67d 100644 --- a/test-util/src/test/java/com/netflix/conductor/test/integration/grpc/AbstractGrpcEndToEndTest.java +++ b/test-util/src/test/java/com/netflix/conductor/test/integration/grpc/AbstractGrpcEndToEndTest.java @@ -20,6 +20,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; +import com.netflix.conductor.ConductorTestApp; import com.netflix.conductor.client.grpc.EventClient; import com.netflix.conductor.client.grpc.MetadataClient; import com.netflix.conductor.client.grpc.TaskClient; @@ -46,6 +47,7 @@ @RunWith(SpringRunner.class) @SpringBootTest( + classes = ConductorTestApp.class, properties = {"conductor.grpc-server.enabled=true", "conductor.grpc-server.port=8092"}) @TestPropertySource(locations = "classpath:application-integrationtest.properties") public abstract class AbstractGrpcEndToEndTest extends AbstractEndToEndTest { diff --git a/test-util/src/test/resources/application-integrationtest.properties b/test-util/src/test/resources/application-integrationtest.properties index 3b9e396ae..2b0e07151 100644 --- a/test-util/src/test/resources/application-integrationtest.properties +++ b/test-util/src/test/resources/application-integrationtest.properties @@ -1,4 +1,6 @@ conductor.db.type=memory +# disable trying to connect to redis and use in-memory +conductor.queue.type=xxx conductor.workflow-execution-lock.type=local_only conductor.external-payload-storage.type=dummy conductor.indexing.enabled=true diff --git a/ui/src/components/NavLink.jsx b/ui/src/components/NavLink.jsx index 3fd7b4623..5763dc115 100644 --- a/ui/src/components/NavLink.jsx +++ b/ui/src/components/NavLink.jsx @@ -26,7 +26,8 @@ export default React.forwardRef((props, ref) => { ); } else { - const href = absolutePath ? url.toString() : cleanDuplicateSlash(getBasename() + url.toString()); + // Note: + '/' + is required here + const href = absolutePath ? url.toString() : cleanDuplicateSlash(getBasename() + '/' + url.toString()); return ( {rest.children} diff --git a/ui/src/plugins/fetch.js b/ui/src/plugins/fetch.js index 4467339ce..16761e771 100644 --- a/ui/src/plugins/fetch.js +++ b/ui/src/plugins/fetch.js @@ -41,6 +41,11 @@ export function fetchWithContext( }); } +/** + * @param {string} path + * @returns path with '/' not duplicated, except at :// + * + */ export function cleanDuplicateSlash(path) { - return path.replace(/([^:]\/)\/+/g, "$1"); + return path.replace(/(:\/\/)\/*|(\/)+/g, "$1$2"); } diff --git a/workflow-event-listener/build.gradle b/workflow-event-listener/build.gradle index b30e145ee..bf322be9a 100644 --- a/workflow-event-listener/build.gradle +++ b/workflow-event-listener/build.gradle @@ -22,4 +22,6 @@ dependencies { //In memory implementation "org.rarefiedredis.redis:redis-java:${revRarefiedRedis}" + testImplementation "redis.clients:jedis:${revJedis}" + } \ No newline at end of file diff --git a/workflow-event-listener/src/test/java/com/netflix/conductor/test/listener/WorkflowStatusPublisherIntegrationTest.java b/workflow-event-listener/src/test/java/com/netflix/conductor/test/listener/WorkflowStatusPublisherIntegrationTest.java index 3aa8b072b..33d909a84 100644 --- a/workflow-event-listener/src/test/java/com/netflix/conductor/test/listener/WorkflowStatusPublisherIntegrationTest.java +++ b/workflow-event-listener/src/test/java/com/netflix/conductor/test/listener/WorkflowStatusPublisherIntegrationTest.java @@ -29,6 +29,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; +import com.netflix.conductor.ConductorTestApp; import com.netflix.conductor.common.metadata.tasks.Task; import com.netflix.conductor.common.metadata.tasks.TaskDef; import com.netflix.conductor.common.metadata.tasks.TaskResult; @@ -51,6 +52,7 @@ @RunWith(SpringRunner.class) @SpringBootTest( + classes = ConductorTestApp.class, properties = { "conductor.db.type=memory", "conductor.workflow-status-listener.type=queue_publisher", diff --git a/workflow-event-listener/src/test/resources/application-integrationtest.properties b/workflow-event-listener/src/test/resources/application-integrationtest.properties index 19e39ec47..a6432a1af 100644 --- a/workflow-event-listener/src/test/resources/application-integrationtest.properties +++ b/workflow-event-listener/src/test/resources/application-integrationtest.properties @@ -14,6 +14,8 @@ # conductor.db.type=memory +# disable trying to connect to redis and use in-memory +conductor.queue.type=xxx conductor.workflow-execution-lock.type=local_only conductor.external-payload-storage.type=dummy conductor.indexing.enabled=false