From: Thanh Ha Date: Thu, 19 Oct 2017 14:02:22 +0000 (-0400) Subject: Revert refspec change breaking submodule build X-Git-Tag: v0.10.4~1 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=sidebyside;h=85ebe3be68d3cc20f990e1f4adfd254b08f8c1f8;hp=31687d241af0b3aff615704d373eb7d0327b940b;p=releng%2Fglobal-jjb.git Revert refspec change breaking submodule build Reverts change I65ef5886af59ec85841734f03bfac781194f780a which introduced a breaking change for submodule projects inside a docs project. Docs builds have a separate script which handles fetching patches from Gerrit so should not be setting the refspec in the SCM plugin. Change-Id: I657a473a274b2831ad1470bb4895a2c8bcf3c92f Signed-off-by: Thanh Ha --- diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master index 3d8f4931..08dccd87 100644 --- a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master @@ -81,7 +81,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. origin - $GERRIT_REFSPEC + $GIT_URL/$PROJECT test-credential diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 8e9def99..99d0a36d 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -248,7 +248,7 @@ branch: '$GERRIT_BRANCH' jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}' - refspec: '$GERRIT_REFSPEC' + refspec: '' # Leave blank!! A later script will handle fetching submodule-recursive: '{submodule-recursive}' choosing-strategy: default