diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 5ee6c1700..013f82202 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -34,7 +34,7 @@ jobs: id: default-input-values run: | DIVVIUP_TS_INTEROP_CONTAINER= ${{ inputs.divviup_ts_interop_container }} - echo "divviup_ts_interop_container=${DIVVIUP_TS_INTEROP_CONTAINER:-us-west2-docker.pkg.dev/divviup-artifacts-public/divviup-ts/divviup_ts_interop_client:dap-draft-02@sha256:dc4c111adce5719fef9d231f79aecb842c3f626d51363b04355e987d6a40aadc}" >> $GITHUB_OUTPUT + echo "divviup_ts_interop_container=${DIVVIUP_TS_INTEROP_CONTAINER:-us-west2-docker.pkg.dev/divviup-artifacts-public/divviup-ts/divviup_ts_interop_client:dap-draft-03@sha256:b03102a4e8eb9e1abf879940aa89d6a04e4a8229a215c715a4c92a0aec4b3be7}" >> $GITHUB_OUTPUT - name: Get OS version id: os-version run: echo "release=$(lsb_release --release --short)" >> $GITHUB_OUTPUT diff --git a/integration_tests/src/client.rs b/integration_tests/src/client.rs index c87f3941b..9fe8c602c 100644 --- a/integration_tests/src/client.rs +++ b/integration_tests/src/client.rs @@ -114,7 +114,7 @@ impl InteropClient { } else { InteropClient { name: "us-west2-docker.pkg.dev/divviup-artifacts-public/divviup-ts/divviup_ts_interop_client".to_string(), - tag: "dap-draft-02@sha256:dc4c111adce5719fef9d231f79aecb842c3f626d51363b04355e987d6a40aadc".to_string(), + tag: "dap-draft-03@sha256:b03102a4e8eb9e1abf879940aa89d6a04e4a8229a215c715a4c92a0aec4b3be7".to_string(), } } } diff --git a/integration_tests/tests/divviup_ts.rs b/integration_tests/tests/divviup_ts.rs index 197a084bb..70baa25a7 100644 --- a/integration_tests/tests/divviup_ts.rs +++ b/integration_tests/tests/divviup_ts.rs @@ -1,5 +1,6 @@ //! These tests check interoperation between the divviup-ts client and Janus aggregators. +use common::{submit_measurements_and_verify_aggregate, test_task_builders}; use janus_core::{ task::VdafInstance, test_util::{install_test_trace_subscriber, testcontainers::container_client}, @@ -13,8 +14,6 @@ use testcontainers::clients::Cli; mod common; -use common::{submit_measurements_and_verify_aggregate, test_task_builders}; - async fn run_divviup_ts_integration_test(container_client: &Cli, vdaf: VdafInstance) { let (collector_private_key, leader_task, helper_task) = test_task_builders(vdaf, janus_aggregator::task::QueryType::TimeInterval); @@ -38,7 +37,6 @@ async fn run_divviup_ts_integration_test(container_client: &Cli, vdaf: VdafInsta } #[tokio::test(flavor = "multi_thread")] -#[ignore] // TODO(#799): re-enable once divviup-ts has been updated for DAP-03 async fn janus_divviup_ts_count() { install_test_trace_subscriber(); @@ -46,7 +44,6 @@ async fn janus_divviup_ts_count() { } #[tokio::test(flavor = "multi_thread")] -#[ignore] // TODO(#799): re-enable once divviup-ts has been updated for DAP-03 async fn janus_divviup_ts_sum() { install_test_trace_subscriber(); @@ -58,7 +55,6 @@ async fn janus_divviup_ts_sum() { } #[tokio::test(flavor = "multi_thread")] -#[ignore] // TODO(#799): re-enable once divviup-ts has been updated for DAP-03 async fn janus_divviup_ts_histogram() { install_test_trace_subscriber();