From c46a2ee5d3185efa8cc557fde72c40f0f4c04a71 Mon Sep 17 00:00:00 2001 From: Rich Bennett Date: Tue, 22 Aug 2017 15:28:45 -0400 Subject: [PATCH] Implement ODL JJB get-scm-with-submodules Provide null refspec to gerrit-trigger-scm Issue-ID: DOC-11 Change-Id: I5e78f9960ecdedba7f7ae247c04d6671d5cf7273 Signed-off-by: Rich Bennett --- jjb/doc/doc-templates-rtd.yaml | 9 +++------ jjb/doc/doc.yaml | 11 ++++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml index 4f54322cd..c1f6159d1 100644 --- a/jjb/doc/doc-templates-rtd.yaml +++ b/jjb/doc/doc-templates-rtd.yaml @@ -9,8 +9,6 @@ # Optional Variables: # path: directory containing the project's tox.ini relative to # the workspace. The default is the project root. - # pattern: ant file-path pattern relative to the workspace used to - # trigger the job name: '{project-name}-{stream}-verify-rtd' path: '$WORKSPACE' @@ -34,7 +32,7 @@ scm: - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' + refspec: '' choosing-strategy: 'gerrit' submodule-recursive: '{submodule-recursive}' @@ -84,8 +82,6 @@ # Optional Variables: # path: directory containing the project's tox.ini relative to # the workspace. The default is the project root. - # pattern: ant file-path pattern relative to the workspace used to - # trigger the job name: '{project-name}-{stream}-merge-rtd' path: '$WORKSPACE' @@ -107,9 +103,10 @@ - maven-exec: maven-version: '{maven-version}' + scm: - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' + refspec: '' choosing-strategy: 'gerrit' submodule-recursive: '{submodule-recursive}' diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 40d592240..b8c33dfa2 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -4,14 +4,15 @@ project-name: 'doc' jobs: - - '{project-name}-{stream}-verify-rtd': - build-node: centos7-basebuild-4c-4g - - '{project-name}-{stream}-merge-rtd' + - '{project-name}-{stream}-verify-rtd': + build-node: centos7-basebuild-4c-4g + - '{project-name}-{stream}-merge-rtd' project: 'doc' + rtdproject: 'onap' stream: - - master: - branch: 'master' + - master: + branch: 'master' -- 2.16.6