From bcf5fa9c9563f1cb74ebdd1532a1a2f0c342dfce Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Fri, 30 May 2025 20:31:13 +0500 Subject: [PATCH 01/11] MPLUG-72 : ALEC: Update smoke tests --- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- pom.xml | 8 ++++---- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- .../java/org/opennms/alec/smoke/util/ssh/SshClient.java | 8 +++++--- smoke-test/src/main/resources/docker_fixed_images | 4 ++-- .../etc/featuresBoot.d/alec.boot | 2 ++ .../etc/featuresBoot.d/alec.boot | 3 +++ .../org.opennms.alec.datasource.opennms.kafka.streams.cfg | 2 +- .../java/org/opennms/alec/smoke/ALECSmokeTestBase.java | 2 +- .../opennms/alec/smoke/containers/OpenNMSContainer.java | 1 + 10 files changed, 21 insertions(+), 13 deletions(-) diff --git a/driver/main/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/driver/main/src/main/resources/OSGI-INF/blueprint/blueprint.xml index ccd0dfbd..24534dfb 100644 --- a/driver/main/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/driver/main/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ - + diff --git a/pom.xml b/pom.xml index f947142a..3ced4b76 100644 --- a/pom.xml +++ b/pom.xml @@ -67,9 +67,9 @@ 2.1.1 2.1.1 4.12 - 3.1.0_1 + 3.6.2_1 2.13 - 3.1.0 + 3.6.2 4.3.10 2.17.0 1.6.0 @@ -90,7 +90,7 @@ 1.7.26 1.1.10.5 2.6.3_1 - 2.8.6 + 3.1.2 1.1.0 1.13.1 2.19.1 @@ -531,7 +531,7 @@ 2.22.1 - -Xmx1024m -Xms1024m -XX:MaxPermSize=512m -Djdk.net.URLClassPath.disableClassPathURLCheck=true + -Xmx1024m -Xms1024m -Djdk.net.URLClassPath.disableClassPathURLCheck=true diff --git a/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml index a6fdb5ad..a174d5c1 100644 --- a/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -2,7 +2,7 @@ + interface="org.opennms.integration.api.v1.coordination.DomainManagerFactory" availability="optional"/> diff --git a/smoke-test/src/main/java/org/opennms/alec/smoke/util/ssh/SshClient.java b/smoke-test/src/main/java/org/opennms/alec/smoke/util/ssh/SshClient.java index ced2b854..b5656441 100644 --- a/smoke-test/src/main/java/org/opennms/alec/smoke/util/ssh/SshClient.java +++ b/smoke-test/src/main/java/org/opennms/alec/smoke/util/ssh/SshClient.java @@ -40,7 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.jcraft.jsch.Channel; +import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Session; @@ -62,7 +62,7 @@ public class SshClient implements AutoCloseable { private final JSch jsch = new JSch(); private Session session; - private Channel channel; + private ChannelShell channel; private InputStream stdout; private InputStream stderr; @@ -92,7 +92,9 @@ public PrintStream openShell() throws Exception { session.setConfig(config); session.connect(); - channel = session.openChannel("shell"); + channel = (ChannelShell) session.openChannel("shell"); + channel.setPty(true); + channel.setPtyType("xterm", 200, 40, 1024, 768); // width=200 columns, height=40 rows, optional pixel size stdout = channel.getInputStream(); stderr = channel.getExtInputStream(); channel.connect(timeout); diff --git a/smoke-test/src/main/resources/docker_fixed_images b/smoke-test/src/main/resources/docker_fixed_images index 3783ba67..a37a3480 100644 --- a/smoke-test/src/main/resources/docker_fixed_images +++ b/smoke-test/src/main/resources/docker_fixed_images @@ -8,5 +8,5 @@ kafka=confluentinc/cp-kafka:7.0.0 postgres=postgres:10.7-alpine # Note this tag version should match the selenium version in the POM selenium=selenium/standalone-chrome-debug:3.4.0 -sentinel=opennms/sentinel:30.0.0 -opennms=opennms/horizon:30.0.0 +sentinel=opennms/sentinel:34.0.0-SNAPSHOT +opennms=opennms/horizon:34.0.0-SNAPSHOT diff --git a/smoke-test/src/main/resources/overlays/sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot b/smoke-test/src/main/resources/overlays/sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot index 00746d43..7515b5d4 100644 --- a/smoke-test/src/main/resources/overlays/sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot +++ b/smoke-test/src/main/resources/overlays/sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot @@ -1,4 +1,6 @@ +sentinel-core sentinel-coordination-zookeeper +alec-sentinel-distributed wait-for-kar=opennms-alec-plugin alec-datasource-opennms-kafka wait-for-kar=opennms-alec-plugin alec-engine-cluster wait-for-kar=opennms-alec-plugin alec-processor-redundant wait-for-kar=opennms-alec-plugin diff --git a/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot b/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot index 56786b74..3c936da3 100644 --- a/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot +++ b/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot @@ -1,3 +1,6 @@ +sentinel-core +sentinel-coordination-zookeeper +alec-sentinel-distributed wait-for-kar=opennms-alec-plugin alec-datasource-opennms-kafka wait-for-kar=opennms-alec-plugin alec-engine-%ALEC_ENGINE_FEATURE% wait-for-kar=opennms-alec-plugin alec-processor-standalone wait-for-kar=opennms-alec-plugin diff --git a/smoke-test/src/main/resources/overlays/sentinel-overlay/etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg b/smoke-test/src/main/resources/overlays/sentinel-overlay/etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg index c944e999..bad88b67 100644 --- a/smoke-test/src/main/resources/overlays/sentinel-overlay/etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg +++ b/smoke-test/src/main/resources/overlays/sentinel-overlay/etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg @@ -1,4 +1,4 @@ bootstrap.servers = kafka:9092 -commit.interval.ms = 500 +commit.interval.ms = 5000 metadata.max.age.ms = 5000 org.apache.karaf.features.configKey = org.opennms.alec.datasource.opennms.kafka.streams \ No newline at end of file diff --git a/smoke-test/src/test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java b/smoke-test/src/test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java index fdb0a07b..329a98f5 100644 --- a/smoke-test/src/test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java +++ b/smoke-test/src/test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java @@ -75,7 +75,7 @@ public abstract class ALECSmokeTestBase { protected OpenNMSRestClient openNMSRestClient; // Define the containers used by all tests - protected final GenericContainer kafkaContainer = new KafkaContainer("7.0.0") + protected final GenericContainer kafkaContainer = new KafkaContainer("7.3.0") .withNetwork(Network.getNetwork()) .withNetworkAliases("kafka") .waitingFor(new ALECSmokeTestBase.WaitForKafkaTopics()); diff --git a/smoke-test/src/test/java/org/opennms/alec/smoke/containers/OpenNMSContainer.java b/smoke-test/src/test/java/org/opennms/alec/smoke/containers/OpenNMSContainer.java index 5b2d6710..6e0da5dc 100644 --- a/smoke-test/src/test/java/org/opennms/alec/smoke/containers/OpenNMSContainer.java +++ b/smoke-test/src/test/java/org/opennms/alec/smoke/containers/OpenNMSContainer.java @@ -83,6 +83,7 @@ public OpenNMSContainer() { .withNetwork(Network.getNetwork()) .withNetworkAliases(ALIAS) .withCommand("-s") + .withExtraHost("localhost", "host-gateway") .waitingFor(new WaitForOpenNMS()); } From 384c257db986bc2e1468a15d2248e00400f31866 Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Fri, 30 May 2025 20:42:01 +0500 Subject: [PATCH 02/11] MPLUG-72 : ALEC: Update smoke tests --- smoke-test/src/main/resources/docker_fixed_images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smoke-test/src/main/resources/docker_fixed_images b/smoke-test/src/main/resources/docker_fixed_images index a37a3480..f2b8b49d 100644 --- a/smoke-test/src/main/resources/docker_fixed_images +++ b/smoke-test/src/main/resources/docker_fixed_images @@ -4,7 +4,7 @@ alpine=alpine:3.5 helm=opennms/helm:2.0.0 # Note the tag version should match the confluent version being used by the kafka container -kafka=confluentinc/cp-kafka:7.0.0 +kafka=confluentinc/cp-kafka:7.3.0 postgres=postgres:10.7-alpine # Note this tag version should match the selenium version in the POM selenium=selenium/standalone-chrome-debug:3.4.0 From 252ea7a06e5c1742c69f76330c73a7bda2de26e4 Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Fri, 30 May 2025 21:58:19 +0500 Subject: [PATCH 03/11] MPLUG-72 : ALEC: Update smoke tests --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d718b0d2..bef3f47c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ executors: build-debian-executor: docker: - - image: cimg/openjdk:11.0.13 + - image: cimg/openjdk:17.0 environment: MAVEN_OPTS: -Xmx2g @@ -19,7 +19,7 @@ executors: machine: image: ubuntu-2204:current environment: - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64 + JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64 MAVEN_OPTS: -Xmx3200m TESTCONTAINERS_RYUK_DISABLED: true KEEP_TMP_OVERLAY: true @@ -174,7 +174,7 @@ commands: - run: name: Run the tests command: | - sudo apt update && sudo apt install -y openjdk-11-jdk + sudo apt update && sudo apt install -y openjdk-17-jdk mkdir $TEST_RECORDING_DIR mvn install --projects org.opennms.alec:smoke-test --also-make -DskipTests=true cd smoke-test From ae74b0d54429fc77c1273c9db5307e495abcada8 Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Fri, 30 May 2025 22:03:21 +0500 Subject: [PATCH 04/11] Revert "MPLUG-72 : ALEC: Update smoke tests" This reverts commit 252ea7a06e5c1742c69f76330c73a7bda2de26e4. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bef3f47c..d718b0d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ executors: build-debian-executor: docker: - - image: cimg/openjdk:17.0 + - image: cimg/openjdk:11.0.13 environment: MAVEN_OPTS: -Xmx2g @@ -19,7 +19,7 @@ executors: machine: image: ubuntu-2204:current environment: - JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64 + JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64 MAVEN_OPTS: -Xmx3200m TESTCONTAINERS_RYUK_DISABLED: true KEEP_TMP_OVERLAY: true @@ -174,7 +174,7 @@ commands: - run: name: Run the tests command: | - sudo apt update && sudo apt install -y openjdk-17-jdk + sudo apt update && sudo apt install -y openjdk-11-jdk mkdir $TEST_RECORDING_DIR mvn install --projects org.opennms.alec:smoke-test --also-make -DskipTests=true cd smoke-test From 16fbf58aea5fc5bb16efda5816d2f55a7531a7fd Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Fri, 30 May 2025 22:07:37 +0500 Subject: [PATCH 05/11] MPLUG-72 : ALEC: Update smoke tests --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3ced4b76..ad22eefc 100644 --- a/pom.xml +++ b/pom.xml @@ -67,9 +67,9 @@ 2.1.1 2.1.1 4.12 - 3.6.2_1 + 3.1.0_1 2.13 - 3.6.2 + 3.1.0 4.3.10 2.17.0 1.6.0 @@ -90,7 +90,7 @@ 1.7.26 1.1.10.5 2.6.3_1 - 3.1.2 + 2.8.6 1.1.0 1.13.1 2.19.1 From 1ccef83a58c86c20b765c35e0ad7c10ea03756a5 Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Sat, 31 May 2025 22:21:29 +0500 Subject: [PATCH 06/11] MPLUG-72 : ALEC: Update smoke tests --- .../main/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- smoke-test/src/main/resources/docker_fixed_images | 2 +- .../sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot | 3 --- .../test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/driver/main/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/driver/main/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 24534dfb..ccd0dfbd 100644 --- a/driver/main/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/driver/main/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,7 +3,7 @@ - + diff --git a/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml index a174d5c1..1bb96f26 100644 --- a/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -2,7 +2,7 @@ + interface="org.opennms.integration.api.v1.coordination.DomainManagerFactory" /> diff --git a/smoke-test/src/main/resources/docker_fixed_images b/smoke-test/src/main/resources/docker_fixed_images index f2b8b49d..a37a3480 100644 --- a/smoke-test/src/main/resources/docker_fixed_images +++ b/smoke-test/src/main/resources/docker_fixed_images @@ -4,7 +4,7 @@ alpine=alpine:3.5 helm=opennms/helm:2.0.0 # Note the tag version should match the confluent version being used by the kafka container -kafka=confluentinc/cp-kafka:7.3.0 +kafka=confluentinc/cp-kafka:7.0.0 postgres=postgres:10.7-alpine # Note this tag version should match the selenium version in the POM selenium=selenium/standalone-chrome-debug:3.4.0 diff --git a/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot b/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot index 3c936da3..56786b74 100644 --- a/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot +++ b/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot @@ -1,6 +1,3 @@ -sentinel-core -sentinel-coordination-zookeeper -alec-sentinel-distributed wait-for-kar=opennms-alec-plugin alec-datasource-opennms-kafka wait-for-kar=opennms-alec-plugin alec-engine-%ALEC_ENGINE_FEATURE% wait-for-kar=opennms-alec-plugin alec-processor-standalone wait-for-kar=opennms-alec-plugin diff --git a/smoke-test/src/test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java b/smoke-test/src/test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java index 329a98f5..fdb0a07b 100644 --- a/smoke-test/src/test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java +++ b/smoke-test/src/test/java/org/opennms/alec/smoke/ALECSmokeTestBase.java @@ -75,7 +75,7 @@ public abstract class ALECSmokeTestBase { protected OpenNMSRestClient openNMSRestClient; // Define the containers used by all tests - protected final GenericContainer kafkaContainer = new KafkaContainer("7.3.0") + protected final GenericContainer kafkaContainer = new KafkaContainer("7.0.0") .withNetwork(Network.getNetwork()) .withNetworkAliases("kafka") .waitingFor(new ALECSmokeTestBase.WaitForKafkaTopics()); From 19630427afe336e6d1805d9234c7b5ddb1b5cd52 Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Mon, 2 Jun 2025 17:11:41 +0500 Subject: [PATCH 07/11] MPLUG-72 : ALEC: Update smoke tests --- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- .../sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot | 1 + .../etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg | 2 +- .../opennms/alec/smoke/containers/ALECSentinelContainer.java | 4 ++-- .../org/opennms/alec/smoke/containers/OpenNMSContainer.java | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 1bb96f26..a6fdb5ad 100644 --- a/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/processor/redundant/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -2,7 +2,7 @@ + interface="org.opennms.integration.api.v1.coordination.DomainManagerFactory"/> diff --git a/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot b/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot index 56786b74..0f07ad18 100644 --- a/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot +++ b/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot @@ -1,3 +1,4 @@ +sentinel-core alec-datasource-opennms-kafka wait-for-kar=opennms-alec-plugin alec-engine-%ALEC_ENGINE_FEATURE% wait-for-kar=opennms-alec-plugin alec-processor-standalone wait-for-kar=opennms-alec-plugin diff --git a/smoke-test/src/main/resources/overlays/sentinel-overlay/etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg b/smoke-test/src/main/resources/overlays/sentinel-overlay/etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg index bad88b67..c944e999 100644 --- a/smoke-test/src/main/resources/overlays/sentinel-overlay/etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg +++ b/smoke-test/src/main/resources/overlays/sentinel-overlay/etc/org.opennms.alec.datasource.opennms.kafka.streams.cfg @@ -1,4 +1,4 @@ bootstrap.servers = kafka:9092 -commit.interval.ms = 5000 +commit.interval.ms = 500 metadata.max.age.ms = 5000 org.apache.karaf.features.configKey = org.opennms.alec.datasource.opennms.kafka.streams \ No newline at end of file diff --git a/smoke-test/src/test/java/org/opennms/alec/smoke/containers/ALECSentinelContainer.java b/smoke-test/src/test/java/org/opennms/alec/smoke/containers/ALECSentinelContainer.java index 66a89653..630016fa 100644 --- a/smoke-test/src/test/java/org/opennms/alec/smoke/containers/ALECSentinelContainer.java +++ b/smoke-test/src/test/java/org/opennms/alec/smoke/containers/ALECSentinelContainer.java @@ -147,8 +147,8 @@ private void waitForALECToTerminate() { LOG.info("Waiting for {} to terminate...", getIndexedAlias()); await() - .atMost(1, TimeUnit.MINUTES) - .pollInterval(5, TimeUnit.SECONDS) + .atMost(3, TimeUnit.MINUTES) + .pollInterval(10, TimeUnit.SECONDS) .until(() -> { try { Karaf.runKarafCommands(getSSHAddress(), "logout"); diff --git a/smoke-test/src/test/java/org/opennms/alec/smoke/containers/OpenNMSContainer.java b/smoke-test/src/test/java/org/opennms/alec/smoke/containers/OpenNMSContainer.java index 6e0da5dc..5b2d6710 100644 --- a/smoke-test/src/test/java/org/opennms/alec/smoke/containers/OpenNMSContainer.java +++ b/smoke-test/src/test/java/org/opennms/alec/smoke/containers/OpenNMSContainer.java @@ -83,7 +83,6 @@ public OpenNMSContainer() { .withNetwork(Network.getNetwork()) .withNetworkAliases(ALIAS) .withCommand("-s") - .withExtraHost("localhost", "host-gateway") .waitingFor(new WaitForOpenNMS()); } From 6f0d1577ba94f362859ec46225dd0ccbe37cbfd3 Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Mon, 2 Jun 2025 18:49:02 +0500 Subject: [PATCH 08/11] MPLUG-72 : ALEC: Update smoke tests --- .../sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot | 2 -- .../sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot | 1 - .../opennms/alec/smoke/containers/ALECSentinelContainer.java | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/smoke-test/src/main/resources/overlays/sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot b/smoke-test/src/main/resources/overlays/sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot index 7515b5d4..00746d43 100644 --- a/smoke-test/src/main/resources/overlays/sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot +++ b/smoke-test/src/main/resources/overlays/sentinel-overlay-redundant/etc/featuresBoot.d/alec.boot @@ -1,6 +1,4 @@ -sentinel-core sentinel-coordination-zookeeper -alec-sentinel-distributed wait-for-kar=opennms-alec-plugin alec-datasource-opennms-kafka wait-for-kar=opennms-alec-plugin alec-engine-cluster wait-for-kar=opennms-alec-plugin alec-processor-redundant wait-for-kar=opennms-alec-plugin diff --git a/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot b/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot index 0f07ad18..56786b74 100644 --- a/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot +++ b/smoke-test/src/main/resources/overlays/sentinel-overlay-standalone/etc/featuresBoot.d/alec.boot @@ -1,4 +1,3 @@ -sentinel-core alec-datasource-opennms-kafka wait-for-kar=opennms-alec-plugin alec-engine-%ALEC_ENGINE_FEATURE% wait-for-kar=opennms-alec-plugin alec-processor-standalone wait-for-kar=opennms-alec-plugin diff --git a/smoke-test/src/test/java/org/opennms/alec/smoke/containers/ALECSentinelContainer.java b/smoke-test/src/test/java/org/opennms/alec/smoke/containers/ALECSentinelContainer.java index 630016fa..66a89653 100644 --- a/smoke-test/src/test/java/org/opennms/alec/smoke/containers/ALECSentinelContainer.java +++ b/smoke-test/src/test/java/org/opennms/alec/smoke/containers/ALECSentinelContainer.java @@ -147,8 +147,8 @@ private void waitForALECToTerminate() { LOG.info("Waiting for {} to terminate...", getIndexedAlias()); await() - .atMost(3, TimeUnit.MINUTES) - .pollInterval(10, TimeUnit.SECONDS) + .atMost(1, TimeUnit.MINUTES) + .pollInterval(5, TimeUnit.SECONDS) .until(() -> { try { Karaf.runKarafCommands(getSSHAddress(), "logout"); From 2a9e8e38766d2890770ee395c5eb78be63ab0adf Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Mon, 2 Jun 2025 20:14:48 +0500 Subject: [PATCH 09/11] MPLUG-72 : ALEC: Update to the latest running version of Opennms. --- smoke-test/src/main/resources/docker_fixed_images | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smoke-test/src/main/resources/docker_fixed_images b/smoke-test/src/main/resources/docker_fixed_images index a37a3480..11032858 100644 --- a/smoke-test/src/main/resources/docker_fixed_images +++ b/smoke-test/src/main/resources/docker_fixed_images @@ -8,5 +8,5 @@ kafka=confluentinc/cp-kafka:7.0.0 postgres=postgres:10.7-alpine # Note this tag version should match the selenium version in the POM selenium=selenium/standalone-chrome-debug:3.4.0 -sentinel=opennms/sentinel:34.0.0-SNAPSHOT -opennms=opennms/horizon:34.0.0-SNAPSHOT +sentinel=opennms/sentinel:33.1.6 +opennms=opennms/horizon:33.1.6 From 03cedc3beaa07bae7e5deffd204798ecc5099364 Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Mon, 2 Jun 2025 20:15:41 +0500 Subject: [PATCH 10/11] Revert "MPLUG-72 : ALEC: Update to the latest running version of Opennms." This reverts commit 2a9e8e38766d2890770ee395c5eb78be63ab0adf. --- smoke-test/src/main/resources/docker_fixed_images | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smoke-test/src/main/resources/docker_fixed_images b/smoke-test/src/main/resources/docker_fixed_images index 11032858..a37a3480 100644 --- a/smoke-test/src/main/resources/docker_fixed_images +++ b/smoke-test/src/main/resources/docker_fixed_images @@ -8,5 +8,5 @@ kafka=confluentinc/cp-kafka:7.0.0 postgres=postgres:10.7-alpine # Note this tag version should match the selenium version in the POM selenium=selenium/standalone-chrome-debug:3.4.0 -sentinel=opennms/sentinel:33.1.6 -opennms=opennms/horizon:33.1.6 +sentinel=opennms/sentinel:34.0.0-SNAPSHOT +opennms=opennms/horizon:34.0.0-SNAPSHOT From 82154f8c2ba9e33d972c9d06b09b85b882159e3b Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Mon, 2 Jun 2025 20:16:32 +0500 Subject: [PATCH 11/11] MPLUG-72 : ALEC: Upgrade to the latest stable version of OpenNMS.. --- smoke-test/src/main/resources/docker_fixed_images | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smoke-test/src/main/resources/docker_fixed_images b/smoke-test/src/main/resources/docker_fixed_images index a37a3480..11032858 100644 --- a/smoke-test/src/main/resources/docker_fixed_images +++ b/smoke-test/src/main/resources/docker_fixed_images @@ -8,5 +8,5 @@ kafka=confluentinc/cp-kafka:7.0.0 postgres=postgres:10.7-alpine # Note this tag version should match the selenium version in the POM selenium=selenium/standalone-chrome-debug:3.4.0 -sentinel=opennms/sentinel:34.0.0-SNAPSHOT -opennms=opennms/horizon:34.0.0-SNAPSHOT +sentinel=opennms/sentinel:33.1.6 +opennms=opennms/horizon:33.1.6