From: Chris Lott <cl778h@att.com>
Date: Wed, 25 Sep 2019 16:12:51 +0000 (+0000)
Subject: Revert "Fix rtd verify job choosing strategy"
X-Git-Tag: v0.44.1~5^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=3521ffe2da5571752d1bdf5508c7f9de2d946b4b;p=releng%2Fglobal-jjb.git

Revert "Fix rtd verify job choosing strategy"

This reverts commit c02c7a2ac05e3a9b987edc15d555a5124a2ad976.

Reason for revert: Acumos RTD jobs are triggered by commits to ANY Acumos repo on a *.rst file.  This change causes the doc job to checkout the commit ID from that other repo, which is never present in the doc repo.

Issue-ID: RELENG-911
Change-Id: Icab10bb8b0e3e3cc28458751a9de1edf88fdc3d7
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 8a8e3aa8..60f89d3a 100644
--- 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
index 35a414d3..00000000
--- 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.