From de4316ce76ca5e210876aa0f3d851236305b89de Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Fri, 7 Aug 2026 21:20:59 +0300 Subject: [PATCH 01/10] osac: strip Tide queries to jira-only --- .../prow/02_config/osac-project/osac/_prowconfig.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml index 5ad2ff5c8af6f..f87a1b927189d 100644 --- a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml +++ b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml @@ -1,15 +1,11 @@ tide: queries: - labels: - - approved - jira/valid-reference - - lgtm missingLabels: - - backports/unvalidated-commits - do-not-merge/hold - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug - - needs-rebase repos: - osac-project/osac From 0ae35da8d34ce70e34816bb1919bfff532d2c1b3 Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Fri, 7 Aug 2026 21:21:06 +0300 Subject: [PATCH 02/10] osac-test-infra: strip Tide queries to jira-only --- .../02_config/osac-project/osac-test-infra/_prowconfig.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml index f4a666ee6c85a..5286d6e91e33b 100644 --- a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml +++ b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml @@ -1,15 +1,11 @@ tide: queries: - labels: - - approved - jira/valid-reference - - lgtm missingLabels: - - backports/unvalidated-commits - do-not-merge/hold - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug - - needs-rebase repos: - osac-project/osac-test-infra From b2279b99a154a7745cd462dbb6a72890fc099f56 Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Fri, 7 Aug 2026 22:31:31 +0300 Subject: [PATCH 03/10] OSAC-3734: osac: remove Tide merge queries (merge queue replaces Tide) --- .../02_config/osac-project/osac/_prowconfig.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml index f87a1b927189d..0967ef424bce6 100644 --- a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml +++ b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml @@ -1,11 +1 @@ -tide: - queries: - - labels: - - jira/valid-reference - missingLabels: - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - repos: - - osac-project/osac +{} From 7c480091e546945070e2b294b8ecf7227db49fde Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Fri, 7 Aug 2026 22:31:37 +0300 Subject: [PATCH 04/10] OSAC-3734: osac-test-infra: remove Tide merge queries (merge queue replaces Tide) --- .../osac-project/osac-test-infra/_prowconfig.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml index 5286d6e91e33b..0967ef424bce6 100644 --- a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml +++ b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml @@ -1,11 +1 @@ -tide: - queries: - - labels: - - jira/valid-reference - missingLabels: - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - repos: - - osac-project/osac-test-infra +{} From 8eb7529e9bf36d5e4a83d6f23076b6120bf3b663 Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Fri, 7 Aug 2026 23:07:34 +0300 Subject: [PATCH 05/10] =?UTF-8?q?OSAC-3734:=20fix=20checkconfig=20?= =?UTF-8?q?=E2=80=94=20use=20empty=20queries=20list,=20not=20empty=20doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prow/02_config/osac-project/osac/_prowconfig.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml index 0967ef424bce6..ec01be7015177 100644 --- a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml +++ b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml @@ -1 +1,2 @@ -{} +tide: + queries: [] From c8d7d3e811b8c8a0e4894207344747a1b7a66f7d Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Fri, 7 Aug 2026 23:07:42 +0300 Subject: [PATCH 06/10] =?UTF-8?q?OSAC-3734:=20fix=20checkconfig=20?= =?UTF-8?q?=E2=80=94=20use=20empty=20queries=20list,=20not=20empty=20doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_config/osac-project/osac-test-infra/_prowconfig.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml index 0967ef424bce6..ec01be7015177 100644 --- a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml +++ b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml @@ -1 +1,2 @@ -{} +tide: + queries: [] From efcc7c94a59fcf26edeef4eb2975994a0a2bedc0 Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Sun, 9 Aug 2026 12:17:48 +0300 Subject: [PATCH 07/10] OSAC-3734: use unreachable label to disable Tide (checkconfig requires repo reference) --- .../prow/02_config/osac-project/osac/_prowconfig.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml index ec01be7015177..578ad81bcab6f 100644 --- a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml +++ b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml @@ -1,2 +1,6 @@ tide: - queries: [] + queries: + - labels: + - tide-merge-disabled + repos: + - osac-project/osac From 73870989b42d790f22662ef507b180ccd64cdc44 Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Sun, 9 Aug 2026 12:17:57 +0300 Subject: [PATCH 08/10] OSAC-3734: use unreachable label to disable Tide (checkconfig requires repo reference) --- .../02_config/osac-project/osac-test-infra/_prowconfig.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml index ec01be7015177..316a41079d4b2 100644 --- a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml +++ b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml @@ -1,2 +1,6 @@ tide: - queries: [] + queries: + - labels: + - tide-merge-disabled + repos: + - osac-project/osac-test-infra From 88d75f974f4ca0d675dbeda4da04ff3c9def6d1c Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Sun, 9 Aug 2026 12:19:03 +0300 Subject: [PATCH 09/10] OSAC-3734: delete Tide config (merge queue replaces Tide) --- .../prow/02_config/osac-project/osac/_prowconfig.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 core-services/prow/02_config/osac-project/osac/_prowconfig.yaml diff --git a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml deleted file mode 100644 index 578ad81bcab6f..0000000000000 --- a/core-services/prow/02_config/osac-project/osac/_prowconfig.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tide: - queries: - - labels: - - tide-merge-disabled - repos: - - osac-project/osac From c7e1b2e0aa60fef78a7221db06c85191efc5398f Mon Sep 17 00:00:00 2001 From: Omer Vishlitzky <22615781+omer-vishlitzky@users.noreply.github.com> Date: Sun, 9 Aug 2026 12:19:10 +0300 Subject: [PATCH 10/10] OSAC-3734: delete Tide config (merge queue replaces Tide) --- .../02_config/osac-project/osac-test-infra/_prowconfig.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml diff --git a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml b/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml deleted file mode 100644 index 316a41079d4b2..0000000000000 --- a/core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tide: - queries: - - labels: - - tide-merge-disabled - repos: - - osac-project/osac-test-infra