From 1eae154c694734dfdf053cf4879f1f9ad077b3b3 Mon Sep 17 00:00:00 2001 From: Max Martin Date: Fri, 30 Oct 2026 16:53:15 +0000 Subject: [PATCH 1/2] Pin CI runners to Ubuntu 26.04 (#5273) Port bjss/AzureTRE-CGI#84 at b5a51d2f0968577c7483ef2d1c1e44f3b7bcd72c onto current upstream main. Co-authored-by: Jay W <40270505+JayDoubleu@users.noreply.github.com> --- .github/linters/actionlint.yml | 5 +++ .github/workflows/build_all_dockerfiles.yml | 6 ++-- .github/workflows/build_docker_images.yml | 2 +- .../workflows/build_validation_develop.yml | 2 +- .github/workflows/clean_validation_envs.yml | 6 ++-- .github/workflows/cli-package.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/deploy_tre_branch.yml | 2 +- .github/workflows/deploy_tre_reusable.yml | 34 +++++++++---------- .github/workflows/e2e_helper_tests.yml | 2 +- .github/workflows/lets_encrypt.yml | 14 +++----- .github/workflows/pr_comment_bot.yml | 6 ++-- .../workflows/resource_processor_tests.yml | 2 +- .github/workflows/test_results.yml | 2 +- CHANGELOG.md | 1 + 15 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/linters/actionlint.yml b/.github/linters/actionlint.yml index daba70a4fd..a5ed03f5ec 100644 --- a/.github/linters/actionlint.yml +++ b/.github/linters/actionlint.yml @@ -1,4 +1,9 @@ --- +# actionlint v1.7.12 does not yet recognise this GitHub-hosted runner label. See https://github.com/rhysd/actionlint/issues/682 +self-hosted-runner: + labels: + - ubuntu-26.04 + # GitHub supports queue: max, but actionlint v1.7.12 does not recognise it. # https://github.com/rhysd/actionlint/issues/687 # Remove these exact parser exceptions when actionlint supports queue. diff --git a/.github/workflows/build_all_dockerfiles.yml b/.github/workflows/build_all_dockerfiles.yml index 75abc206fb..9e1cc9b899 100644 --- a/.github/workflows/build_all_dockerfiles.yml +++ b/.github/workflows/build_all_dockerfiles.yml @@ -36,7 +36,7 @@ permissions: jobs: discover: name: Discover Targets - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: contents: read pull-requests: read # For path filter @@ -81,7 +81,7 @@ jobs: name: Build ${{ matrix.target.name }} needs: discover if: needs.discover.outputs.matrix != '[]' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 45 permissions: contents: read @@ -132,7 +132,7 @@ jobs: - discover - build if: always() && needs.discover.result == 'success' && needs.discover.outputs.matrix != '[]' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: contents: read steps: diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml index 4a8089b734..4fe9561a14 100644 --- a/.github/workflows/build_docker_images.yml +++ b/.github/workflows/build_docker_images.yml @@ -20,7 +20,7 @@ permissions: jobs: docker_build: name: Build images - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: contents: read actions: write # For uploading artifacts diff --git a/.github/workflows/build_validation_develop.yml b/.github/workflows/build_validation_develop.yml index 38de2e8713..1a11f37ddf 100644 --- a/.github/workflows/build_validation_develop.yml +++ b/.github/workflows/build_validation_develop.yml @@ -19,7 +19,7 @@ permissions: jobs: lint: name: Lint - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: contents: read pull-requests: read # For paths-filter and super-linter diff --git a/.github/workflows/clean_validation_envs.yml b/.github/workflows/clean_validation_envs.yml index 4754ce6b0b..27b0cacdfc 100644 --- a/.github/workflows/clean_validation_envs.yml +++ b/.github/workflows/clean_validation_envs.yml @@ -33,7 +33,7 @@ jobs: name: Plan cleanup outputs: refs: ${{ steps.plan.outputs.refs }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: CICD timeout-minutes: 30 permissions: @@ -71,7 +71,7 @@ jobs: cancel-in-progress: false queue: max name: Clean ${{ matrix.ref }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: CICD # Deletion is synchronous so the job keeps deploy- until Azure finishes. # Use the GitHub-hosted maximum, which explicit destruction also uses. @@ -114,7 +114,7 @@ jobs: cancel-in-progress: false queue: max if: github.event_name == 'workflow_dispatch' && inputs.mode == 'validate' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: CICD timeout-minutes: 25 permissions: diff --git a/.github/workflows/cli-package.yml b/.github/workflows/cli-package.yml index 412323f044..7ddb7dba42 100644 --- a/.github/workflows/cli-package.yml +++ b/.github/workflows/cli-package.yml @@ -17,7 +17,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 # environment is used to access the secrets for Azure credentials # to sign in to a container registry to re-use a dev container image as a build cache environment: ${{ inputs.environment || 'CICD'}} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index acab1a4590..c0e67c0489 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,7 +29,7 @@ concurrency: jobs: analyze: name: Analyze - runs-on: ubuntu-22.04 + runs-on: ubuntu-26.04 permissions: actions: read contents: read diff --git a/.github/workflows/deploy_tre_branch.yml b/.github/workflows/deploy_tre_branch.yml index 1da062c6ef..3026c3dece 100644 --- a/.github/workflows/deploy_tre_branch.yml +++ b/.github/workflows/deploy_tre_branch.yml @@ -59,7 +59,7 @@ permissions: jobs: prepare-not-main: name: Preparation - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: ${{ inputs.environment }} if: | github.ref != 'refs/heads/main' diff --git a/.github/workflows/deploy_tre_reusable.yml b/.github/workflows/deploy_tre_reusable.yml index ffc65f879a..1e9be79b99 100644 --- a/.github/workflows/deploy_tre_reusable.yml +++ b/.github/workflows/deploy_tre_reusable.yml @@ -158,7 +158,7 @@ env: jobs: verify_deployment_lock: name: Verify deployment lock - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 5 permissions: actions: read @@ -185,7 +185,7 @@ jobs: name: Deploy Management needs: [verify_deployment_lock] if: ${{ !inputs.skipDeployment }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: id-token: write checks: write @@ -375,7 +375,7 @@ jobs: build_core_images: # used to build images used by core infrastructure name: Build Core Docker Images - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [deploy_management] environment: ${{ inputs.environmentName }} strategy: @@ -411,7 +411,7 @@ jobs: start_tre: name: Start TRE - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [deploy_management] environment: ${{ inputs.environmentName }} steps: @@ -437,7 +437,7 @@ jobs: deploy_tre: name: Deploy TRE - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [build_core_images, start_tre] environment: ${{ inputs.environmentName }} steps: @@ -509,7 +509,7 @@ jobs: publish_bundles: name: Publish Bundles - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [deploy_management] strategy: matrix: @@ -578,7 +578,7 @@ jobs: publish_shared_bundles: name: Publish Shared Bundles - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [deploy_management] strategy: matrix: @@ -631,7 +631,7 @@ jobs: register_shared_bundles: name: Register Shared Bundles - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [publish_shared_bundles, deploy_tre] strategy: matrix: @@ -690,7 +690,7 @@ jobs: register_bundles: name: Register Bundles - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [publish_bundles, deploy_tre] strategy: matrix: @@ -759,7 +759,7 @@ jobs: register_user_resource_bundles: name: Register User Resource Bundles - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 # user resource bundles need to wait for their parent resource to be registered. needs: [register_bundles, publish_bundles, deploy_tre] strategy: @@ -816,7 +816,7 @@ jobs: deploy_shared_services: name: Deploy shared services - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [register_shared_bundles, deploy_tre] environment: ${{ inputs.environmentName }} steps: @@ -869,7 +869,7 @@ jobs: deploy_ui: name: Deploy UI - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [deploy_tre] environment: ${{ inputs.environmentName }} steps: @@ -912,7 +912,7 @@ jobs: (inputs.skipDeployment || !contains(needs.*.result, 'skipped')) && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: ${{ inputs.environmentName }} needs: [verify_deployment_lock, deploy_shared_services, register_bundles, deploy_ui] timeout-minutes: 10 @@ -962,7 +962,7 @@ jobs: (inputs.skipDeployment || !contains(needs.*.result, 'skipped')) && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 needs: [deploy_shared_services, register_bundles, register_user_resource_bundles] timeout-minutes: 10 @@ -997,7 +997,7 @@ jobs: (inputs.skipDeployment || !contains(needs.*.result, 'skipped')) && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: ${{ inputs.environmentName }} needs: [verify_deployment_lock, deploy_shared_services, register_bundles, register_user_resource_bundles, e2e_tests_plan, e2e_tests_smoke] @@ -1062,7 +1062,7 @@ jobs: (inputs.skipDeployment || !contains(needs.*.result, 'skipped')) && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: ${{ inputs.environmentName }} # Smoke tests also write to TRE. Finish them before any selected bundle lifecycle. needs: @@ -1137,7 +1137,7 @@ jobs: summary: name: Summary needs: [e2e_tests_smoke, e2e_tests_plan, e2e_tests_custom, e2e_tests_bundle] - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: checks: write contents: read diff --git a/.github/workflows/e2e_helper_tests.yml b/.github/workflows/e2e_helper_tests.yml index 2c4f0a5277..f27aa34155 100644 --- a/.github/workflows/e2e_helper_tests.yml +++ b/.github/workflows/e2e_helper_tests.yml @@ -20,7 +20,7 @@ permissions: jobs: test: name: Test E2E helpers - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: # actions/checkout v6 diff --git a/.github/workflows/lets_encrypt.yml b/.github/workflows/lets_encrypt.yml index 16da5ef852..386c308095 100644 --- a/.github/workflows/lets_encrypt.yml +++ b/.github/workflows/lets_encrypt.yml @@ -29,7 +29,7 @@ env: jobs: renew_letsencrypt_certs: name: Renew Lets Encrypt Certificates - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: ${{ github.event.inputs.environment || 'CICD' }} steps: - name: Checkout @@ -37,15 +37,6 @@ jobs: with: persist-credentials: false - - name: Install specific Azure CLI version - run: | - AZ_DIST=$(lsb_release -cs) - AZ_VER=2.81.0 - - apt-cache policy azure-cli - sudo apt-get install azure-cli="${AZ_VER}-1~${AZ_DIST}" --allow-downgrades - az version - - name: Install Terraform uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0 with: @@ -60,6 +51,9 @@ jobs: subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} environment: ${{ (vars.AZURE_ENVIRONMENT != '' && vars.AZURE_ENVIRONMENT) || 'AzureCloud' }} + - name: Update apt package index + run: sudo apt-get update + - name: Renew Certificates shell: bash env: diff --git a/.github/workflows/pr_comment_bot.yml b/.github/workflows/pr_comment_bot.yml index b7b364997c..a62bab3e80 100644 --- a/.github/workflows/pr_comment_bot.yml +++ b/.github/workflows/pr_comment_bot.yml @@ -78,7 +78,7 @@ jobs: destroy_pr_env: needs: [pr_comment] if: ${{ needs.pr_comment.outputs.command == 'test-destroy-env' }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: id-token: write contents: read @@ -124,7 +124,7 @@ jobs: destroy_branch_env: needs: [pr_comment] if: ${{ needs.pr_comment.outputs.command == 'test-destroy-env' && needs.pr_comment.outputs.branchCiGitRef != '' }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: id-token: write contents: read @@ -171,7 +171,7 @@ jobs: name: Prepare PR environment needs: [pr_comment] if: ${{ startsWith(needs.pr_comment.outputs.command, 'run-tests') }} - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 environment: CICD outputs: refid: ${{ steps.environment-id.outputs.refid }} diff --git a/.github/workflows/resource_processor_tests.yml b/.github/workflows/resource_processor_tests.yml index 424be61f61..a97e8c90ed 100644 --- a/.github/workflows/resource_processor_tests.yml +++ b/.github/workflows/resource_processor_tests.yml @@ -17,7 +17,7 @@ permissions: jobs: test: name: Test Resource Processor and Porter compatibility - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 10 services: mongodb: diff --git a/.github/workflows/test_results.yml b/.github/workflows/test_results.yml index 96ca2c1126..c3293b6360 100644 --- a/.github/workflows/test_results.yml +++ b/.github/workflows/test_results.yml @@ -14,7 +14,7 @@ permissions: jobs: test-results: name: Test Results - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 if: github.event.workflow_run.conclusion != 'skipped' permissions: diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e263cf715..ee955f563d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ See [Legacy Airlock & migration](docs/azure-tre-overview/airlock.md#legacy-airlo * Let a fork run CI in a shared subscription with the `CI_ENV_PREFIX` variable and a `ci_repository` tag, which scope cleanup and destruction. Keep a CI environment, for example for a demo, with a `ci_keep_until` tag. (`core` 0.18.15, `devops` 0.7.0, `build-scripts` 1.1.5) ([#5272](https://github.com/microsoft/AzureTRE/pull/5272)) BUG FIXES: +* Pin GitHub-hosted workflow jobs to `ubuntu-26.04`, allow the label in actionlint, and use the runner's preinstalled Azure CLI in the Let's Encrypt workflow. Refresh the apt package index before installing certificate renewal dependencies. ([#5273](https://github.com/microsoft/AzureTRE/issues/5273)) * Update Nexus from 3.94.0 to 3.94.3. The Nexus 3.94.3 image stops trusting the eMudhra certificate chains that Sonatype reports as compromised. (`tre-shared-service-sonatype-nexus` 3.11.3) ([#5276](https://github.com/microsoft/AzureTRE/issues/5276)) * Change the Azure Monitor private link scope of the core and of each workspace only after its private endpoint exists. In workspaces, also wait 5 minutes after the scope changes before Terraform deletes the endpoint. A scope change makes Azure update the endpoint, and during the update Azure rejects DNS zone group changes with 409 AnotherOperationInProgress, so some workspaces failed to deploy or delete. From 3c077cca37deb6f20fb0f457d7d3f5274899abd7 Mon Sep 17 00:00:00 2001 From: Max Martin Date: Fri, 30 Oct 2026 16:53:46 +0000 Subject: [PATCH 2/2] Wrap actionlint compatibility comment (#5273) --- .github/linters/actionlint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/linters/actionlint.yml b/.github/linters/actionlint.yml index a5ed03f5ec..86992dad0b 100644 --- a/.github/linters/actionlint.yml +++ b/.github/linters/actionlint.yml @@ -1,5 +1,6 @@ --- -# actionlint v1.7.12 does not yet recognise this GitHub-hosted runner label. See https://github.com/rhysd/actionlint/issues/682 +# actionlint v1.7.12 does not yet recognise this GitHub-hosted runner label. +# https://github.com/rhysd/actionlint/issues/682 self-hosted-runner: labels: - ubuntu-26.04