Second drop of changes from azure-cleanroom.

.github/actions/test-multi-party-collab/test-db-access/action.yml

@@ -53,6 +53,34 @@ runs:
       if: ${{ !cancelled() }}
       run: kubectl logs -l app=virtual-cleanroom --tail=-1 --all-containers --ignore-errors --prefix
 
+    - uses: actions/upload-artifact@v4
+      with:
+          name: results-db-access
+          path: ./test/onebox/multi-party-collab/db-access/generated/results
+          overwrite: true
+      if: ${{ !cancelled() }}
+
+    - uses: actions/upload-artifact@v4
+      with:
+          name: configurations-db-access
+          path: ./test/onebox/multi-party-collab/db-access/generated/configurations
+          overwrite: true
+      if: ${{ !cancelled() }}
+
+    - uses: actions/upload-artifact@v4
+      with:
+          name: deployments-db-access
+          path: ./test/onebox/multi-party-collab/db-access/generated/deployments
+          overwrite: true
+      if: ${{ !cancelled() }}
+
+    - uses: actions/upload-artifact@v4
+      with:
+          name: ccf-db-access
+          path: ./test/onebox/multi-party-collab/generated/ccf
+          overwrite: true
+      if: ${{ !cancelled() }}
+
     - name: Delete resource groups
       shell: pwsh
       if: success()

.github/actions/test-multi-party-collab/test-encrypted-storage-caci/action.yml

@@ -29,13 +29,20 @@ runs:
         SUBSCRIPTION_ID: ${{ env.AZURE_SUBSCRIPTION_ID }}
 
     - name: Log in to Azure Container Registry
+      if: ${{ !contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
       shell: pwsh
       run: az acr login -n ${{ inputs.registry-url}}
 
     - name: Run collab scenario on caci
+      if: ${{ !contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
       shell: pwsh
       run: pwsh ./test/onebox/multi-party-collab/encrypted-storage/run-collab-aci.ps1 -registry acr -registryUrl ${{ inputs.registry-url }} -tag ${{ inputs.tag }}
 
+    - name: Run collab scenario on caci
+      if: ${{ contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
+      shell: pwsh
+      run: pwsh ./test/onebox/multi-party-collab/encrypted-storage/run-collab-aci.ps1 -registry mcr -registryUrl ${{ inputs.registry-url }} -tag ${{ inputs.tag }} -NoBuild
+
     - name: Dump ccf-provider-client logs
       shell: pwsh
       if: ${{ !cancelled() }}
@@ -53,28 +60,28 @@ runs:
 
     - uses: actions/upload-artifact@v4
       with:
-          name: results
-          path: ./test/onebox/multi-party-collab/encrypted-storage/generated/results
+          name: results-encrypted-storage-caci
+          path: ./test/onebox/multi-party-collab/encrypted-storage/generated/results-decrypted
           overwrite: true
       if: ${{ !cancelled() }}
 
     - uses: actions/upload-artifact@v4
       with:
-          name: configurations
+          name: configurations-encrypted-storage-caci
           path: ./test/onebox/multi-party-collab/encrypted-storage/generated/configurations
           overwrite: true
       if: ${{ !cancelled() }}
 
     - uses: actions/upload-artifact@v4
       with:
-          name: deployments
+          name: deployments-encrypted-storage-caci
           path: ./test/onebox/multi-party-collab/encrypted-storage/generated/deployments
           overwrite: true
       if: ${{ !cancelled() }}
 
     - uses: actions/upload-artifact@v4
       with:
-          name: ccf
+          name: ccf-encrypted-storage-caci
           path: ./test/onebox/multi-party-collab/generated/ccf
           overwrite: true
       if: ${{ !cancelled() }}

.github/actions/test-multi-party-collab/test-encrypted-storage-cleanroom-client/action.yml

@@ -63,6 +63,34 @@ runs:
       if: ${{ !cancelled() }}
       run: kubectl logs -l app=virtual-cleanroom --tail=-1 --all-containers --ignore-errors --prefix
 
+    - uses: actions/upload-artifact@v4
+      with:
+          name: results-encrypted-storage-cleanroom-client
+          path: ./test/onebox/multi-party-collab/encrypted-storage/cleanroom-client/generated/results
+          overwrite: true
+      if: ${{ !cancelled() }}
+
+    - uses: actions/upload-artifact@v4
+      with:
+          name: configurations-encrypted-storage-cleanroom-client
+          path: ./test/onebox/multi-party-collab/encrypted-storage/cleanroom-client/generated/configurations
+          overwrite: true
+      if: ${{ !cancelled() }}
+
+    - uses: actions/upload-artifact@v4
+      with:
+          name: deployments-encrypted-storage-cleanroom-client
+          path: ./test/onebox/multi-party-collab/encrypted-storage/cleanroom-client/generated/deployments
+          overwrite: true
+      if: ${{ !cancelled() }}
+
+    - uses: actions/upload-artifact@v4
+      with:
+          name: ccf-encrypted-storage-cleanroom-client
+          path: ./test/onebox/multi-party-collab/generated/ccf
+          overwrite: true
+      if: ${{ !cancelled() }}
+
     - name: Delete resource groups
       shell: pwsh
       if: success()

.github/actions/test-multi-party-collab/test-encrypted-storage/action.yml

@@ -53,6 +53,34 @@ runs:
     shell: pwsh
     run: kubectl logs -l app=virtual-cleanroom --tail=-1 --all-containers --ignore-errors --prefix
 
+  - uses: actions/upload-artifact@v4
+    with:
+      name: results-encrypted-storage
+      path: ./test/onebox/multi-party-collab/encrypted-storage/generated/results-decrypted
+      overwrite: true
+    if: ${{ !cancelled() }}
+
+  - uses: actions/upload-artifact@v4
+    with:
+        name: configurations-encrypted-storage
+        path: ./test/onebox/multi-party-collab/encrypted-storage/generated/configurations
+        overwrite: true
+    if: ${{ !cancelled() }}
+
+  - uses: actions/upload-artifact@v4
+    with:
+        name: deployments-encrypted-storage
+        path: ./test/onebox/multi-party-collab/encrypted-storage/generated/deployments
+        overwrite: true
+    if: ${{ !cancelled() }}
+
+  - uses: actions/upload-artifact@v4
+    with:
+        name: ccf-encrypted-storage
+        path: ./test/onebox/multi-party-collab/generated/ccf
+        overwrite: true
+    if: ${{ !cancelled() }}
+
   - name: Delete resource groups
     if: success()
     shell: pwsh

.github/actions/test-multi-party-collab/test-ml-training-caci/action.yml

@@ -32,10 +32,12 @@ runs:
         SUBSCRIPTION_ID: ${{ env.AZURE_SUBSCRIPTION_ID }}
 
     - name: Log in to Azure Container Registry
+      if: ${{ !contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
       shell: pwsh
       run: az acr login -n ${{ inputs.registry-url}}
 
     - name: Run collab scenario on caci
+      if: ${{ !contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
       shell: pwsh
       run: |
         $env:TDP_HSM_RESOURCE_GROUP='${{ env.TDP_HSM_RESOURCE_GROUP }}'
@@ -44,6 +46,16 @@ runs:
         $env:TDC_MHSM_NAME='${{ env.TDC_MHSM_NAME }}'
         ./test/onebox/multi-party-collab/ml-training/run-collab-aci.ps1 -registry acr -registryUrl ${{ inputs.registry-url }} -tag ${{ inputs.tag }} -kvType "${{ inputs.kvType }}"
 
+    - name: Run collab scenario on caci
+      if: ${{ contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
+      shell: pwsh
+      run: |
+        $env:TDP_HSM_RESOURCE_GROUP='${{ env.TDP_HSM_RESOURCE_GROUP }}'
+        $env:TDP_MHSM_NAME='${{ env.TDP_MHSM_NAME }}'
+        $env:TDC_HSM_RESOURCE_GROUP='${{ env.TDC_HSM_RESOURCE_GROUP }}'
+        $env:TDC_MHSM_NAME='${{ env.TDC_MHSM_NAME }}'
+        ./test/onebox/multi-party-collab/ml-training/run-collab-aci.ps1 -registry mcr -registryUrl ${{ inputs.registry-url }} -tag ${{ inputs.tag }} -kvType "${{ inputs.kvType }}" -NoBuild
+
     - name: Dump ccf-provider-client logs
       shell: pwsh
       if: ${{ !cancelled() }}
@@ -57,31 +69,31 @@ runs:
     - name: Upload results
       uses: actions/upload-artifact@v4
       with:
-          name: results
+          name: results-ml-training-caci
           path: ./test/onebox/multi-party-collab/ml-training/generated/results
           overwrite: true
       if: ${{ !cancelled() }}
 
     - name: Upload configurations
       uses: actions/upload-artifact@v4
       with:
-          name: configurations
+          name: configurations-ml-training-caci
           path: ./test/onebox/multi-party-collab/ml-training/generated/configurations
           overwrite: true
       if: ${{ !cancelled() }}
 
     - name: Upload deployments
       uses: actions/upload-artifact@v4
       with:
-          name: deployments
+          name: deployments-ml-training-caci
           path: ./test/onebox/multi-party-collab/ml-training/generated/deployments
           overwrite: true
       if: ${{ !cancelled() }}
 
     - name: Upload ccf
       uses: actions/upload-artifact@v4
       with:
-          name: ccf
+          name: ccf-ml-training-caci
           path: ./test/onebox/multi-party-collab/generated/ccf
           overwrite: true
       if: ${{ !cancelled() }}

.github/actions/test-multi-party-collab/test-nginx-hello-caci/action.yml

@@ -33,13 +33,20 @@ runs:
         SUBSCRIPTION_ID: ${{ env.AZURE_SUBSCRIPTION_ID }}
 
     - name: Log in to Azure Container Registry
+      if: ${{ !contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
       shell: pwsh
       run: az acr login -n ${{ inputs.registry-url}}
 
     - name: Run collab scenario on caci
+      if: ${{ !contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
       shell: pwsh
       run: ./test/onebox/multi-party-collab/nginx-hello/run-collab-aci.ps1 -registry acr -registryUrl ${{ inputs.registry-url }} -tag ${{ inputs.tag }}
 
+    - name: Run collab scenario on caci
+      if: ${{ contains(inputs.registry-url, 'mcr.microsoft.com/cleanroom') }}
+      shell: pwsh
+      run: ./test/onebox/multi-party-collab/nginx-hello/run-collab-aci.ps1 -registry mcr -registryUrl ${{ inputs.registry-url }} -tag ${{ inputs.tag }} -NoBuild
+
     - name: Dump ccf-provider-client logs
       shell: pwsh
       if: ${{ !cancelled() }}
@@ -55,34 +62,26 @@ runs:
       shell: pwsh
       run: docker logs ccr-client-proxy
 
-    - name: Upload results
-      uses: actions/upload-artifact@v4
-      with:
-          name: results
-          path: ./test/onebox/multi-party-collab/nginx-hello/generated/results
-          overwrite: true
-      if: ${{ !cancelled() }}
-
     - name: Upload configurations
       uses: actions/upload-artifact@v4
       with:
-          name: configurations
+          name: configurations-nginx-hello-caci
           path: ./test/onebox/multi-party-collab/nginx-hello/generated/configurations
           overwrite: true
       if: ${{ !cancelled() }}
 
     - name: Upload deployments
       uses: actions/upload-artifact@v4
       with:
-          name: deployments
+          name: deployments-nginx-hello-caci
           path: ./test/onebox/multi-party-collab/nginx-hello/generated/deployments
           overwrite: true
       if: ${{ !cancelled() }}
 
     - name: Upload ccf
       uses: actions/upload-artifact@v4
       with:
-          name: ccf
+          name: ccf-nginx-hello-caci
           path: ./test/onebox/multi-party-collab/generated/ccf
           overwrite: true
       if: ${{ !cancelled() }}

.github/actions/test-multi-party-collab/test-nginx-hello/action.yml

@@ -64,6 +64,30 @@ runs:
       shell: pwsh
       run: kubectl logs -l app=ccr-client-proxy --tail=-1 --all-containers --ignore-errors --prefix
 
+    - name: Upload configurations
+      uses: actions/upload-artifact@v4
+      with:
+          name: configurations-nginx-hello
+          path: ./test/onebox/multi-party-collab/nginx-hello/generated/configurations
+          overwrite: true
+      if: ${{ !cancelled() }}
+
+    - name: Upload deployments
+      uses: actions/upload-artifact@v4
+      with:
+          name: deployments-nginx-hello
+          path: ./test/onebox/multi-party-collab/nginx-hello/generated/deployments
+          overwrite: true
+      if: ${{ !cancelled() }}
+
+    - name: Upload ccf
+      uses: actions/upload-artifact@v4
+      with:
+          name: ccf-nginx-hello
+          path: ./test/onebox/multi-party-collab/generated/ccf
+          overwrite: true
+      if: ${{ !cancelled() }}
+
     - name: Delete resource groups
       if: success()
       shell: pwsh

.github/actions/test-multi-party-collab/test-triton-inference-caci/action.yml

@@ -43,31 +43,31 @@ runs:
     - name: Upload results
       uses: actions/upload-artifact@v4
       with:
-          name: results
+          name: results-triton-inference-caci
           path: ./test/onebox/multi-party-collab/triton-inference-server/generated/results
           overwrite: true
       if: ${{ !cancelled() }}
 
     - name: Upload configurations
       uses: actions/upload-artifact@v4
       with:
-          name: configurations
+          name: configurations-triton-inference-caci
           path: ./test/onebox/multi-party-collab/triton-inference-server/generated/configurations
           overwrite: true
       if: ${{ !cancelled() }}
 
     - name: Upload deployments
       uses: actions/upload-artifact@v4
       with:
-          name: deployments
+          name: deployments-triton-inference-caci
           path: ./test/onebox/multi-party-collab/triton-inference-server/generated/deployments
           overwrite: true
       if: ${{ !cancelled() }}
 
     - name: Upload ccf
       uses: actions/upload-artifact@v4
       with:
-          name: ccf
+          name: ccf-triton-inference-caci
           path: ./test/onebox/multi-party-collab/generated/ccf
           overwrite: true
       if: ${{ !cancelled() }}

.github/workflows/official_build.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: Install powershell-yaml
         shell: pwsh
@@ -75,7 +75,6 @@ jobs:
         env:
           CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }}
           TENANT_ID: ${{ vars.AZURE_TENANT_ID }}
-          SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
 
       - name: Build identity sidecar
         if: ${{ contains(inputs.build-type, 'cleanroom-containers') }}