Merge branch 'main' into jojijacob-create-population-requisition-fulf…

…iller-daemon

.github/workflows/build-test.yml

@@ -67,6 +67,8 @@ jobs:
           build --define worker2_id=worker2
           build --define worker2_public_api_target=worker2.example.com:8443
           build --define mc_name=measurementConsumers/foo
+          build --define mc_api_key=foo
+          build --define mc_cert_name=measurementConsumers/foo/certificates/bar
           build --define edp1_name=dataProviders/foo1
           build --define edp1_cert_name=dataProviders/foo1/certificates/bar1
           build --define edp2_name=dataProviders/foo2

.github/workflows/run-k8s-tests.yml

@@ -52,13 +52,15 @@ jobs:
         MC_NAME: ${{ vars.MC_NAME }}
         MC_API_KEY: ${{ secrets.MC_API_KEY }}
         GCLOUD_PROJECT: ${{ vars.GCLOUD_PROJECT }}
+        REPORTING_PUBLIC_API_TARGET: ${{ vars.REPORTING_PUBLIC_API_TARGET }}
       run: |
         cat << EOF > ~/.bazelrc
         common --config=ci
         build --define kingdom_public_api_target=$KINGDOM_PUBLIC_API_TARGET
         build --define mc_name=$MC_NAME
         build --define mc_api_key=$MC_API_KEY
         build --define google_cloud_project=$GCLOUD_PROJECT
+        build --define reporting_public_api_target=$REPORTING_PUBLIC_API_TARGET
         test --test_output=streamed
         test --test_timeout=3600
         EOF

.github/workflows/scan-images.yml

@@ -66,16 +66,13 @@ jobs:
           - kingdom/system-api
           - duchy/herald
           - duchy/spanner-computations
-          - reporting/postgres-data-server
           - kingdom/exchanges-deletion
-          - reporting/v1alpha-public-api
-          - reporting/postgres-update-schema
-          - reporting/v2/v2alpha-public-api
-          - reporting/v2/postgres-update-schema
           - panel-exchange/gcloud-example-daemon
           - panel-exchange/aws-example-daemon
-          - simulator/synthetic-generator-edp
+          - reporting/v2/v2alpha-public-api
+          - reporting/v2/postgres-update-schema
           - reporting/v2/postgres-internal-server
+          - simulator/synthetic-generator-edp
           - duchy/postgres-update-schema
           - duchy/gcloud-postgres-update-schema
           - duchy/postgres-internal-server

.github/workflows/update-cmms.yml

@@ -124,15 +124,6 @@ jobs:
   # Update the Reporting system.
   #
   # This isn't technically part of the CMMS, but we do it here for simplicity.
-  update-reporting:
-    uses: ./.github/workflows/configure-reporting.yml
-    secrets: inherit
-    needs: [publish-images, terraform]
-    with:
-      image-tag: ${{ needs.publish-images.outputs.image-tag }}
-      environment: ${{ inputs.environment }}
-      apply: ${{ inputs.apply }}
-
   update-reporting-v2:
     uses: ./.github/workflows/configure-reporting-v2.yml
     secrets: inherit

docs/gke/correctness-test.md

@@ -80,7 +80,8 @@ bazel test //src/test/kotlin/org/wfanet/measurement/integration/k8s:SyntheticGen
 --test_output=streamed \
 --define=kingdom_public_api_target=v2alpha.kingdom.dev.halo-cmm.org:8443 \
 --define=mc_name=measurementConsumers/Rcn7fKd25C8 \
---define=mc_api_key=W9q4zad246g
+--define=mc_api_key=W9q4zad246g \
+--define=reporting_public_api_target=v2alpha.reporting.dev.halo-cmm.org:8443
 ```
 
 The time the test takes depends on the size of the data set. With the default

docs/gke/metrics-deployment.md

@@ -30,7 +30,7 @@ free to use whichever you prefer.
 Deploy a Halo component. See the related guides:
 [Create Kingdom Cluster](kingdom-deployment.md),
 [Create Duchy Cluster](duchy-deployment.md), or
-[Create Reporting Cluster](reporting-server-deployment.md).
+[Create Reporting Cluster](reporting-server-v2-deployment.md).
 
 ## Google Cloud APIs