COH-31421 - Integrate Coherence AI changes to main and release a new version to Pypi

Author: dhirupandey

.github/workflows/validate-nslookup.yml

@@ -21,7 +21,7 @@ jobs:
         poetry-version: ["1.8.4"]
         os: [ubuntu-latest]
         coherenceVersion:
-          - 24.09
+          - 24.09.2
           - 22.06.11
         base-image:
           - gcr.io/distroless/java17-debian11

.github/workflows/validate.yml

@@ -21,7 +21,7 @@ jobs:
         poetry-version: ["1.8.4"]
         os: [ubuntu-latest]
         coherenceVersion:
-          - 24.09
+          - 24.09.2
           - 22.06.11
         base-image:
           - gcr.io/distroless/java17-debian11

Makefile

@@ -84,8 +84,12 @@ E2E_TESTS := tests/e2e/test_session.py \
 				tests/e2e/test_filters.py \
 				tests/e2e/test_processors.py \
 				tests/e2e/test_aggregators.py \
-				tests/e2e/test_near_caching.py \
-#				tests/e2e/test_ai.py \
+				tests/e2e/test_near_caching.py
+
+#----------------------------------------------------------------------------------------------------------------------
+# AI tests
+# ----------------------------------------------------------------------------------------------------------------------
+AI_TESTS := tests/e2e/test_ai.py
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Clean-up all of the build artifacts
@@ -171,6 +175,13 @@ generate-proto:  ## Generate Proto Files
 test:  ##
 	pytest -W error --cov src/coherence --cov-report=term --cov-report=html $(UNIT_TESTS) $(E2E_TESTS)
 
+# ----------------------------------------------------------------------------------------------------------------------
+# Run tests with code coverage
+# ----------------------------------------------------------------------------------------------------------------------
+.PHONY: test-with-ai
+test-with-ai:  ##
+	pytest -W error --cov src/coherence --cov-report=term --cov-report=html $(UNIT_TESTS) $(E2E_TESTS) $(AI_TESTS)
+
 # ----------------------------------------------------------------------------------------------------------------------
 # Run nslookup tests with code coverage
 # ----------------------------------------------------------------------------------------------------------------------

tests/scripts/run-tests.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # https://oss.oracle.com/licenses/upl.
 #
@@ -30,21 +30,45 @@ if [ -z "${PROFILE_STR}" ] ; then
   exit 1
 fi
 
-echo "Coherence CE 22.06.11"
-COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
-  COHERENCE_VERSION=$COH_VER \
-  COHERENCE_BASE_IMAGE=$BASE_IMAGE \
-  PROFILES=$PROFILE_STR \
-  make clean test-cluster-shutdown remove-app-images build-test-images test-cluster-startup just-wait test
-
-echo "Coherence CE 22.06.11 with SSL"
-RUN_SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true \
-  COHERENCE_TLS_CERTS_PATH=$(pwd)/tests/utils/certs/guardians-ca.crt \
-  COHERENCE_TLS_CLIENT_CERT=$(pwd)/tests/utils/certs/star-lord.crt \
-  COHERENCE_TLS_CLIENT_KEY=$(pwd)/tests/utils/certs/star-lord.pem \
+if [[ "${COH_VER}" =~ "22.06" ]] ; then
+  echo "Coherence CE ${COH_VER}"
   COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
-  COHERENCE_VERSION=$COH_VER \
-  COHERENCE_BASE_IMAGE=$BASE_IMAGE \
-  PROFILES=$PROFILE_STR,secure \
-  make clean certs test-cluster-shutdown remove-app-images \
-                                                  build-test-images test-cluster-startup just-wait test
+    COHERENCE_VERSION=$COH_VER \
+    COHERENCE_BASE_IMAGE=$BASE_IMAGE \
+    PROFILES=$PROFILE_STR \
+    make clean test-cluster-shutdown remove-app-images build-test-images test-cluster-startup just-wait test
+else
+  echo "Coherence CE ${COH_VER}"
+  COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
+      COHERENCE_VERSION=$COH_VER \
+      COHERENCE_BASE_IMAGE=$BASE_IMAGE \
+      PROFILES=$PROFILE_STR \
+      make clean test-cluster-shutdown remove-app-images build-test-images test-cluster-startup just-wait test-with-ai
+fi
+
+# Run tests with SSL
+if [[ "${COH_VER}" =~ "22.06" ]] ; then
+  echo "Coherence CE ${COH_VER} with SSL"
+  RUN_SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true \
+    COHERENCE_TLS_CERTS_PATH=$(pwd)/tests/utils/certs/guardians-ca.crt \
+    COHERENCE_TLS_CLIENT_CERT=$(pwd)/tests/utils/certs/star-lord.crt \
+    COHERENCE_TLS_CLIENT_KEY=$(pwd)/tests/utils/certs/star-lord.pem \
+    COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
+    COHERENCE_VERSION=$COH_VER \
+    COHERENCE_BASE_IMAGE=$BASE_IMAGE \
+    PROFILES=$PROFILE_STR,secure \
+    make clean certs test-cluster-shutdown remove-app-images \
+                                                    build-test-images test-cluster-startup just-wait test
+else
+  echo "Coherence CE ${COH_VER} with SSL"
+  RUN_SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true \
+    COHERENCE_TLS_CERTS_PATH=$(pwd)/tests/utils/certs/guardians-ca.crt \
+    COHERENCE_TLS_CLIENT_CERT=$(pwd)/tests/utils/certs/star-lord.crt \
+    COHERENCE_TLS_CLIENT_KEY=$(pwd)/tests/utils/certs/star-lord.pem \
+    COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
+    COHERENCE_VERSION=$COH_VER \
+    COHERENCE_BASE_IMAGE=$BASE_IMAGE \
+    PROFILES=$PROFILE_STR,secure \
+    make clean certs test-cluster-shutdown remove-app-images \
+                                                    build-test-images test-cluster-startup just-wait test-with-ai
+fi