Fix location of Prow's Tide configuration (#35)

feast-dev · Jan 4, 2019 · 14cb64c · 14cb64c
1 parent ccbf615
commit 14cb64c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/testing/prow/config.yaml b/testing/prow/config.yaml
@@ -15,4 +15,22 @@ postsubmits:
       containers:
       - image: us.gcr.io/kf-feast/test-image:1.0.0
         args: ["make", "test"]
-        imagePullPolicy: Always
+        imagePullPolicy: Always
+
+tide:
+  queries:
+  - repos:
+    - gojek/feast
+    labels:
+    - lgtm
+    - approved
+    missingLabels:
+    - do-not-merge
+    - do-not-merge/hold
+    - do-not-merge/invalid-owners-file
+    - do-not-merge/work-in-progress
+    - needs-rebase
+  merge_method:
+    gojek/feast: squash
+  blocker_label: merge-blocker
+  squash_label: tide/squash
diff --git a/testing/prow/plugins.yaml b/testing/prow/plugins.yaml
@@ -10,22 +10,4 @@ plugins:
   - size
   - verify-owners   # Validates OWNERS file changes in PRs.
   - wip   # Applies a label to PRs with wip in the title to block merge
-  - trigger
-
-tide:
-  queries:
-  - repos:
-    - gojek/feast
-    labels:
-    - lgtm
-    - approved
-    missingLabels:
-    - do-not-merge
-    - do-not-merge/hold
-    - do-not-merge/invalid-owners-file
-    - do-not-merge/work-in-progress
-    - needs-rebase
-  merge_method:
-    gojek/feast: squash
-  blocker_label: merge-blocker
-  squash_label: tide/squash
+  - trigger