Merge "Migrate docs-rtd to archive-builds macro"

[releng/builder.git] / jjb / docs / docs-rtd.yaml

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 9c367c59771d37d2f89030644871f65005f35140..f480ed5d1abe919865549c9eefe4b42fcbbd9e59 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -7,6 +7,8 @@
     stream:
         - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
 
     project: 'docs'
     rtdproject: 'opendaylight'
@@ -21,17 +23,15 @@
         daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '30'
 
     triggers:
         - gerrit:
@@ -57,6 +57,8 @@
     publishers:
         - email-notification:
             email-prefix: '[docs]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'docs-verify-rtd-{stream}'
@@ -68,22 +70,19 @@
         daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm-with-submodules:
-            credentials-id: '{ssh-credentials}'
             branch: '{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -107,7 +106,6 @@
                       pattern: docs/**
         - timed: 'H H * * *'
 
-
     builders:
         - shell: |
             if [ "$GERRIT_PROJECT" != "docs" ]; then
@@ -116,13 +114,6 @@
             else
                 git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
             fi
-        - shell: |
-            mkdir -p docs/_static/integration/robot
-            cd docs/submodules/integration/test
-            git pull origin master
-            cd csit/libraries
-            for f in *.robot; do python -m robot.libdoc $f $WORKSPACE/docs/_static/integration/robot/$f.html; done
-            for f in *.py; do python -m robot.libdoc $f $WORKSPACE/docs/_static/integration/robot/$f.html; done
         - shell: |
             virtualenv $WORKSPACE/venv
             source $WORKSPACE/venv/bin/activate
@@ -134,3 +125,5 @@
     publishers:
         - email-notification:
             email-prefix: '[docs]'
+        - archive-build:
+            maven-version: '{mvn33}'