From f1937e2bd8ec7e9626fa2e5a28f20c615c0b8e43 Mon Sep 17 00:00:00 2001 From: joshua Date: Sat, 23 Mar 2024 10:24:20 +0000 Subject: [PATCH] Update core and cloud artifacts, diagonistics disable command --- dependencies/vaticle/artifacts.bzl | 4 ++-- java/test/behaviour/connection/ConnectionStepsBase.java | 2 +- java/test/integration/DriverQueryTest.java | 2 +- tool/test/start-cloud-servers.sh | 2 +- tool/test/start-core-server.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies/vaticle/artifacts.bzl b/dependencies/vaticle/artifacts.bzl index 67df208c4c..5afc32a3a6 100644 --- a/dependencies/vaticle/artifacts.bzl +++ b/dependencies/vaticle/artifacts.bzl @@ -29,7 +29,7 @@ def vaticle_typedb_artifact(): artifact_name = "typedb-server-{platform}-{version}.{ext}", tag_source = deployment["artifact"]["release"]["download"], commit_source = deployment["artifact"]["snapshot"]["download"], - commit = "66d8deeea813ac8a0f0aa42d6117b600ce62fe6f", + commit = "fee8e9c5a8c17a58b4639b91e23458e715e0d3a3", ) def vaticle_typedb_cloud_artifact(): @@ -39,7 +39,7 @@ def vaticle_typedb_cloud_artifact(): artifact_name = "typedb-cloud-server-{platform}-{version}.{ext}", tag_source = deployment_private["artifact"]["release"]["download"], commit_source = deployment_private["artifact"]["snapshot"]["download"], - commit = "ff7170c2ced9870fbc079f2499694c0dee1d3389", + commit = "2c96925694c196be3c898aa3ffc0f56ccc84f400", ) maven_artifacts = { diff --git a/java/test/behaviour/connection/ConnectionStepsBase.java b/java/test/behaviour/connection/ConnectionStepsBase.java index fe7d58e61c..4ef4fc54f2 100644 --- a/java/test/behaviour/connection/ConnectionStepsBase.java +++ b/java/test/behaviour/connection/ConnectionStepsBase.java @@ -63,7 +63,7 @@ public abstract class ConnectionStepsBase { ); public static final Map serverOptions = map( - pair("--diagnostics.reporting.enable", "false") + pair("--diagnostics.reporting.errors", "false") ); public static TypeDBTransaction tx() { diff --git a/java/test/integration/DriverQueryTest.java b/java/test/integration/DriverQueryTest.java index 7498571d77..80645dba17 100644 --- a/java/test/integration/DriverQueryTest.java +++ b/java/test/integration/DriverQueryTest.java @@ -74,7 +74,7 @@ public class DriverQueryTest { @BeforeClass public static void setUpClass() throws InterruptedException, IOException, TimeoutException { Map options = new HashMap<>(); - options.put("--diagnostics.reporting.enable", "false"); + options.put("--diagnostics.reporting.errors", "false"); typedb = new TypeDBCoreRunner(options); typedb.start(); typedbDriver = TypeDB.coreDriver(typedb.address()); diff --git a/tool/test/start-cloud-servers.sh b/tool/test/start-cloud-servers.sh index 938bde1ddc..177afabc12 100755 --- a/tool/test/start-cloud-servers.sh +++ b/tool/test/start-cloud-servers.sh @@ -49,7 +49,7 @@ function server_start() { --server.encryption.file.internal-grpc.root-ca=`realpath tool/test/resources/encryption/int-grpc-root-ca.pem` \ --server.encryption.file.internal-zmq.private-key=`realpath tool/test/resources/encryption/int-zmq-private-key` \ --server.encryption.file.internal-zmq.public-key=`realpath tool/test/resources/encryption/int-zmq-public-key` \ - --diagnostics.reporting.enable=false + --diagnostics.reporting.errors=false } rm -rf $(seq 1 $NODE_COUNT) typedb-cloud-all diff --git a/tool/test/start-core-server.sh b/tool/test/start-core-server.sh index b2277e9ee4..1b864359cc 100755 --- a/tool/test/start-core-server.sh +++ b/tool/test/start-core-server.sh @@ -26,7 +26,7 @@ rm -rf typedb-all bazel run //tool/test:typedb-extractor -- typedb-all BAZEL_JAVA_HOME=$(bazel run //tool/test:echo-java-home) -JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.enable=false & +JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.errors=false & set +e POLL_INTERVAL_SECS=0.5