From 83b017994ecb7cd3ff976bc9faf5c7904750e97e Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 28 Mar 2024 15:57:37 -0600 Subject: [PATCH] ci: fix mergify auto merge test names The test names must match exactly for the mergify auto merge to complete successfully. Update two of the test names to match the latest CI. Signed-off-by: Travis Nielsen --- .github/workflows/canary-integration-test.yml | 2 +- .mergify.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index bb096e215..13653ea8d 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -1087,7 +1087,7 @@ jobs: with: name: ${{ github.job }}-${{ matrix.ceph-image }} - encryption-pvc-kms-vault-k: + encryption-pvc-kms-vault-k8s-auth: runs-on: ubuntu-20.04 if: "!contains(github.event.pull_request.labels.*.name, 'skip-ci')" strategy: diff --git a/.mergify.yml b/.mergify.yml index 547c53da9..79feaa2ea 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -239,7 +239,7 @@ pull_request_rules: - "check-success=docs-check" - "check-success=pylint" - "check-success=canary (quay.io/ceph/ceph:v18)" - - "check-success=raw-disk (quay.io/ceph/ceph:v18)" + - "check-success=raw-disk-with-object (quay.io/ceph/ceph:v18)" - "check-success=two-osds-in-device (quay.io/ceph/ceph:v18)" - "check-success=osd-with-metadata-partition-device (quay.io/ceph/ceph:v18)" - "check-success=osd-with-metadata-device (quay.io/ceph/ceph:v18)"