Fix release file name

.azure-pipelines-gh-pages.yml

@@ -7,7 +7,11 @@ trigger:
 
 jobs:
   - job: build_and_publish_docs
-    container: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-virtual-clang15
+    displayName: "Build and publish docs"
+    variables:
+      Codeql.SkipTaskAutoInjection: true
+      skipComponentGovernanceDetection: true
+    container: ccfmsrc.azurecr.io/ccf/ci:2024-06-26-virtual-clang15
     pool:
       vmImage: ubuntu-20.04
 

.azure-pipelines-quictls.yml

@@ -17,8 +17,8 @@ parameters:
 
 jobs:
   - job: build_quictls
-    container: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-virtual
-    pool: 1es-dv4-focal
+    container: ccfmsrc.azurecr.io/ccf/ci:27-04-2023-clang15
+    pool: ado-virtual-ccf-sub
 
     strategy:
       matrix:

.azure-pipelines-release.yml

@@ -0,0 +1,36 @@
+trigger:
+  tags:
+    include:
+      - ccf-4.*
+
+pr: none
+
+resources:
+  containers:
+    - container: virtual
+      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
+
+    - container: snp
+      image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
+      options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
+
+    - container: sgx
+      image: ghcr.io/microsoft/ccf/ci/sgx:build-25-07-2024
+      options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro
+
+variables:
+  ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/ccf-') }}:
+    perf_or_release: release
+    perf_tests: no_run
+  ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/tags/ccf-')) }}:
+    perf_or_release: perf
+    perf_tests: run
+
+jobs:
+  - template: .azure-pipelines-templates/configure.yml
+
+  - template: .azure-pipelines-templates/release-matrix.yml
+    parameters:
+      perf_or_release: ${{ variables['perf_or_release'] }}
+      perf_tests: ${{ variables['perf_tests'] }}

.azure-pipelines-templates/azure_cli.yml

@@ -2,12 +2,6 @@ steps:
   - script: |
       set -ex
       curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-      # After the extension being in public preview, we can install the latest version automatically
-      # by `az extension update --name confcom`.
-      # But for now we need to manually manage the version. 
-      az extension add --source https://acccliazext.blob.core.windows.net/confcom/confcom-0.2.10-py3-none-any.whl -y
-      # Workaround of bug in v0.2.10
-      sudo chmod +x /opt/az/azcliextensions/confcom/azext_confcom/bin/dmverity-vhd
-      az login --service-principal -u ${{ parameters.app_id }} -p ${{ parameters.service_principal_password }} --tenant ${{ parameters.tenant }}
+      az login --identity -u "${{ parameters.managed_identity_id }}"
     name: setup_azure_cli
     displayName: "Install Azure CLI and login"

.azure-pipelines-templates/common.yml

@@ -27,6 +27,9 @@ jobs:
         parameters:
           target: "${{ parameters.target }}"
 
+      - ${{ if eq(parameters.installExtendedTestingTools, true) }}:
+          - template: install_extended_testing_tools.yml
+
       - ${{ if not(eq(parameters.suffix, 'ScanBuild')) }}:
           - template: cmake.yml
             parameters:
@@ -55,8 +58,9 @@ jobs:
       - ${{ if eq(parameters.suffix, 'ScanBuild') }}:
           - template: scan_build.yml
 
-      - ${{ if eq(parameters.suffix, 'Perf') }}:
-          - template: push_perf_data.yml
+      # Temporarily disabled, until cimetrics supports auth other than connection-string
+      # - ${{ if eq(parameters.suffix, 'Perf') }}:
+      #     - template: push_perf_data.yml
 
       - ${{ if eq(parameters.suffix, 'Release') }}:
           - template: install_deb.yml

.azure-pipelines-templates/configure.yml

@@ -11,7 +11,7 @@ jobs:
         clean: true
       - script: |
           echo "Determine if any code has changed."
-          if git diff --ignore-submodules=dirty --quiet origin/${SYSTEM_PULLREQUEST_TARGETBRANCH:-origin/main} -- ':!doc' ':!*.md' ':!tla' ':!scripts/azure_deployment' ':!.azure-pipelines-attestation-container.yml'; then
+          if git diff --ignore-submodules=dirty --quiet origin/${SYSTEM_PULLREQUEST_TARGETBRANCH:-origin/main} -- ':!doc' ':!*.md' ':!scripts/azure_deployment'; then
             echo " - Documentation change only"
             echo "##vso[task.setvariable variable=docOnly;isOutput=true]true" #set variable docOnly to true
           else

.azure-pipelines-templates/daily-matrix.yml

@@ -2,16 +2,13 @@ parameters:
   env:
     Virtual:
       container: virtual
-      pool: 1es-dv4-focal
-    VirtualClang15:
-      container: virtualclang15
-      pool: 1es-dv4-focal
+      pool: ado-virtual-ccf-sub
     SGX:
       container: sgx
-      pool: 1es-DC16s_v3-focal
+      pool: ado-sgx-ccf-sub-backup
     SNPCC:
       container: snp
-      pool: 1es-dv4-focal
+      pool: ado-virtual-ccf-sub
 
   build:
     common:
@@ -42,7 +39,7 @@ parameters:
 jobs:
   - job: "Make"
     displayName: "Make generator"
-    ${{ insert }}: "${{ parameters.env.VirtualClang15 }}"
+    ${{ insert }}: "${{ parameters.env.Virtual }}"
     dependsOn: configure
     steps:
       - checkout: self
@@ -58,23 +55,25 @@ jobs:
   - template: common.yml
     parameters:
       target: Virtual
-      env: "${{ parameters.env.VirtualClang15 }}"
+      env: "${{ parameters.env.Virtual }}"
       fetch_quictls: debug
-      cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.debug.cmake_args }} ${{ parameters.build.SAN.cmake_args }} ${{ parameters.build.QUICTLS.cmake_args }} ${{ parameters.build.Virtual.cmake_args }}"
+      cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.debug.cmake_args }} ${{ parameters.build.SAN.cmake_args }} ${{ parameters.build.Virtual.cmake_args }}"
       suffix: "Instrumented"
       artifact_name: "Virtual_Instrumented"
       ctest_filter: '-LE "benchmark|perf"'
       ctest_timeout: "1600"
       depends_on: configure
+      installExtendedTestingTools: true
 
   - template: common.yml
     parameters:
       target: Virtual
-      env: "${{ parameters.env.VirtualClang15 }}"
+      env: "${{ parameters.env.Virtual}}"
       cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.debug.cmake_args }} ${{ parameters.build.Virtual.cmake_args }}"
       suffix: "ScanBuild"
       artifact_name: "Virtual_ScanBuild"
       depends_on: configure
+      installExtendedTestingTools: true
 
   - template: common.yml
     parameters:
@@ -85,6 +84,7 @@ jobs:
       artifact_name: "SGX_Release"
       ctest_filter: '-LE "benchmark|perf|rotation"'
       depends_on: configure
+      installExtendedTestingTools: true
 
   - template: common.yml
     parameters:
@@ -96,16 +96,18 @@ jobs:
       artifact_name: "SNPCC_Release"
       ctest_filter: '-LE "benchmark|perf|rotation"'
       depends_on: configure
+      installExtendedTestingTools: true
 
   - template: common.yml
     parameters:
-      target: VirtualClang15
-      env: ${{ parameters.env.VirtualClang15 }}
+      target: Virtual
+      env: ${{ parameters.env.Virtual }}
       cmake_args: "${{ parameters.build.common.cmake_args }} ${{ parameters.build.Virtual.cmake_args }} -DCLIENT_PROTOCOLS_TEST=ON -DSHUFFLE_SUITE=ON"
       suffix: "Release"
       artifact_name: "Virtual_Release"
       ctest_filter: '-LE "benchmark|perf|rotation"'
       depends_on: configure
+      installExtendedTestingTools: true
 
   - template: common.yml
     parameters:
@@ -116,3 +118,4 @@ jobs:
       artifact_name: "SGX_Unsafe"
       ctest_filter: '-LE "benchmark|perf|rotation"'
       depends_on: configure
+      installExtendedTestingTools: true