Updating CI

eclipse-uprotocol · Aug 2, 2024 · 644d7c4 · 644d7c4
1 parent 2f32798
commit 644d7c4
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 7 deletions.
diff --git a/scripts/install_cpp_test_agent.py b/scripts/install_cpp_test_agent.py
@@ -37,6 +37,10 @@ def main():
     parser.add_argument(
         '--up-client-socket-version', type=str, help='Specify the version of up_client_socket', required=False
     )
+    parser.add_argument('--zenohc-version', type=str, help='Specify the version of zenohc', required=False)
+    parser.add_argument('--zenohcpp-version', type=str, help='Specify the version of zenohcpp', required=False)
+    parser.add_argument('--up-transport-zenoh-cpp', type=str, help='Specify the version of zenohcpp', required=False)
+
     args = parser.parse_args()
 
     repo_url = "https://github.com/eclipse-uprotocol/up-conan-recipes.git"
@@ -74,6 +78,32 @@ def main():
                 ]
             )
 
+        # Install zenohc
+        print("Install zenohc")
+        if args.zenohc_version:
+            run_command(["conan", "create", "zenohc-tmp/prebuilt", "--version", args.zenohc_version, "--build=missing"])
+
+        # Install zenohcpp
+        print("Install zenohcpp")
+        if args.zenohcpp_version:
+            run_command(
+                ["conan", "create", "zenohcpp-tmp/from-source", "--version", args.zenohcpp_version, "--build=missing"]
+            )
+
+        # Install up-transport-zenoh-cpp
+        print("Install up-transport-zenoh-cpp")
+        if args.up_transport_zenoh_cpp:
+            run_command(
+                [
+                    "conan",
+                    "create",
+                    "up-transport-zenoh-cpp/developer/",
+                    "--version",
+                    args.up_transport_zenoh_cpp,
+                    "--build=missing",
+                ]
+            )
+
         with change_directory(os.path.abspath(os.path.join("..", "..", "test_agent", "cpp"))):
             # Build the CPP test agent executable
             print("Build the CPP test agent executable")

diff --git a/scripts/install_dependencies.py b/scripts/install_dependencies.py
@@ -69,7 +69,10 @@ def main():
         "python install_cpp_test_agent.py "
         "--up-core-api-version 1.6.0 "
         "--up-cpp-version 1.0.1-rc1 "
-        "--up-client-socket-version 1.0.0-dev"
+        "--up-client-socket-version 1.0.0-dev "
+        "--zenohc-version 1.0.0-rc5 "
+        "--zenohcpp-version 1.0.0-rc5 "
+        "--up-transport-zenoh-cpp 1.0.0-dev"
     )
 
 

diff --git a/test_manager/reports/summary/summary.json b/test_manager/reports/summary/summary.json
diff --git a/test_manager/testData/workflow_test_data.json b/test_manager/testData/workflow_test_data.json
@@ -23,21 +23,34 @@
         "path": "L2_APIs",
         "ue1": ["cpp"],
         "ue2": ["cpp"],
-        "transports": ["socket"]
+        "transports": ["socket", "zenoh"]
     },
     {
         "feature_name" : "publish_and_subscribe",
         "path": "L2_APIs",
         "ue1": ["cpp"],
         "ue2": ["cpp"],
-        "transports": ["socket"]
+        "transports": ["socket", "zenoh"]
     },
     {
         "feature_name" : "rpc_server_and_client",
         "path": "L2_APIs",
         "ue1": ["cpp"],
         "ue2": ["cpp"],
         "transports": ["socket"]
-    } 
+    },
+    {
+        "feature_name" : "register_and_send",
+        "path": "transport_rpc",
+        "ue1": ["cpp"],
+        "ue2": ["cpp"],
+        "transports": ["zenoh"]
+    },
+    {
+        "feature_name" : "register_and_unregister",
+        "path": "transport_rpc",
+        "ue1": ["cpp"],
+        "transports": ["zenoh"] 
+    }
 
 ]