Merge "Revert "Fix rtd verify job choosing strategy""

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 8a8e3aa..60f89d3 100644 (file)
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -209,7 +209,7 @@
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
           submodule-disable: "{submodule-disable}"
-          choosing-strategy: gerrit
+          choosing-strategy: default
 
     triggers:
       - gerrit:

diff --git a/releasenotes/notes/fix-rtd-verify-12b5784f1c22b5d9.yaml b/releasenotes/notes/fix-rtd-verify-12b5784f1c22b5d9.yaml
deleted file mode 100644 (file)
index 35a414d..0000000
--- a/releasenotes/notes/fix-rtd-verify-12b5784f1c22b5d9.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-fixes:
-  - |
-    Update choosing-strategy from default to gerrit to allow building with
-    specific refspec parameters and while not having to also set the branch to master.