From 2fcad50e47d7241a3713b90514343ddadab02559 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Fri, 19 Apr 2024 09:07:24 -0600 Subject: [PATCH 1/2] ci: update mergify rules for k8s 1.30 With the update to run CI on K8s 1.30, we update the mergify auto merge rules for the 1.14 branch. Signed-off-by: Travis Nielsen --- .mergify.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 79feaa2ea..2f8d84c68 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -260,15 +260,15 @@ pull_request_rules: - "check-success=multus-cluster-network (quay.io/ceph/ceph:v18)" - "check-success=csi-hostnetwork-disabled (quay.io/ceph/ceph:v18)" - "check-success=TestCephSmokeSuite (v1.25.16)" - - "check-success=TestCephSmokeSuite (v1.29.2)" + - "check-success=TestCephSmokeSuite (v1.30.0)" - "check-success=TestCephHelmSuite (v1.25.16)" - - "check-success=TestCephHelmSuite (v1.29.2)" - - "check-success=TestCephMultiClusterDeploySuite (v1.29.2)" - - "check-success=TestCephObjectSuite (v1.29.2)" + - "check-success=TestCephHelmSuite (v1.30.0)" + - "check-success=TestCephMultiClusterDeploySuite (v1.30.0)" + - "check-success=TestCephObjectSuite (v1.30.0)" - "check-success=TestCephUpgradeSuite (v1.25.16)" - - "check-success=TestCephUpgradeSuite (v1.29.2)" + - "check-success=TestCephUpgradeSuite (v1.30.0)" - "check-success=TestHelmUpgradeSuite (v1.25.16)" - - "check-success=TestHelmUpgradeSuite (v1.29.2)" + - "check-success=TestHelmUpgradeSuite (v1.30.0)" actions: merge: method: merge From 380c2257bc325af42b35df00e821102f441126b9 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Fri, 19 Apr 2024 10:46:58 -0600 Subject: [PATCH 2/2] ci: add full canary test name for mergify auto merge Mergify is not auto-merging 1.14 backport PRs. All tests appear to match the mergify definition perfectly, but the canary-tests prefix is also needed on the tests for proper merge. Signed-off-by: Travis Nielsen --- .mergify.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 2f8d84c68..053ca7e6d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -238,27 +238,27 @@ pull_request_rules: - "check-success=crds-gen" - "check-success=docs-check" - "check-success=pylint" - - "check-success=canary (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)" - - "check-success=encryption (quay.io/ceph/ceph:v18)" - - "check-success=lvm (quay.io/ceph/ceph:v18)" - - "check-success=pvc (quay.io/ceph/ceph:v18)" - - "check-success=pvc-db (quay.io/ceph/ceph:v18)" - - "check-success=pvc-db-wal (quay.io/ceph/ceph:v18)" - - "check-success=encryption-pvc (quay.io/ceph/ceph:v18)" - - "check-success=encryption-pvc-db (quay.io/ceph/ceph:v18)" - - "check-success=encryption-pvc-db-wal (quay.io/ceph/ceph:v18)" - - "check-success=encryption-pvc-kms-vault-token-auth (quay.io/ceph/ceph:v18)" - - "check-success=encryption-pvc-kms-vault-k8s-auth (quay.io/ceph/ceph:v18)" - - "check-success=lvm-pvc (quay.io/ceph/ceph:v18)" - - "check-success=multi-cluster-mirroring (quay.io/ceph/ceph:v18)" - - "check-success=rgw-multisite-testing (quay.io/ceph/ceph:v18)" - - "check-success=encryption-pvc-kms-ibm-kp (quay.io/ceph/ceph:v18)" - - "check-success=multus-cluster-network (quay.io/ceph/ceph:v18)" - - "check-success=csi-hostnetwork-disabled (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / canary (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / raw-disk-with-object (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / two-osds-in-device (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / osd-with-metadata-partition-device (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / osd-with-metadata-device (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / encryption (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / lvm (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / pvc (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / pvc-db (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / pvc-db-wal (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / encryption-pvc (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / encryption-pvc-db (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / encryption-pvc-db-wal (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / encryption-pvc-kms-vault-token-auth (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / encryption-pvc-kms-vault-k8s-auth (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / lvm-pvc (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / multi-cluster-mirroring (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / rgw-multisite-testing (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / encryption-pvc-kms-ibm-kp (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / multus-cluster-network (quay.io/ceph/ceph:v18)" + - "check-success=canary-tests / csi-hostnetwork-disabled (quay.io/ceph/ceph:v18)" - "check-success=TestCephSmokeSuite (v1.25.16)" - "check-success=TestCephSmokeSuite (v1.30.0)" - "check-success=TestCephHelmSuite (v1.25.16)"