Merge "Add option checkout devstack commit"

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 68469cae95d714bc9c8e0fabe1dbf5ddb69197d0..4725f8235096ea92461e0f09bb086278cc68802e 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -2,26 +2,23 @@
 - project:
     name: docs-rtd
     jobs:
-      - 'docs-merge-rtd-{stream}'
-      - 'docs-verify-rtd-{stream}'
+      - '{project-name}-rtd-jobs'
       - gerrit-tox-verify
 
     stream:
       - oxygen:
-          branch: 'master'
-          jdk: 'openjdk8'
+          branch: master
       - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
+          branch: stable/nitrogen
       - carbon:
-          branch: 'stable/carbon'
+          branch: stable/carbon
       - boron:
-          branch: 'stable/boron'
+          branch: stable/boron
 
     project: docs
     project-name: docs
     build-node: centos7-java-builder-2c-4g
-    rtdproject: opendaylight
+    rtd-project: opendaylight
     archive-artifacts: ''
 
 - job-template:

diff --git a/jjb/global-jjb b/jjb/global-jjb
index 0ee567bb454432e6e4ca1bc6f45431b68e95bad3..4b443776a06b171d842e2d66c6d21ceddb176909 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit 0ee567bb454432e6e4ca1bc6f45431b68e95bad3
+Subproject commit 4b443776a06b171d842e2d66c6d21ceddb176909

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index f6a46f2bc8ec127c3d6c726a932ce28bcf2ce69f..6aca633f8e7a3bdc85d11c82621bbb144463f19a 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -41,11 +41,14 @@
 - project:
     name: lf-infra-lftools
     jobs:
+      - '{project-name}-rtd-jobs'
       - gerrit-tox-verify
 
     project-name: lf-infra-lftools
     project: releng/lftools
+    project-pattern: releng/lftools
     build-node: centos7-java-builder-2c-4g
+    rtd-project: lf-releng-tools
     stream: master
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT