Remove ARCHIVE_ARTIFACTS overwrite

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

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index b87ddfec3c9fe5d6002e7dfdf14868601e191bc0..e6461e14c06cd34e547f5d929eccca9456ce1bda 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -2,127 +2,19 @@
 - project:
     name: docs-rtd
     jobs:
-      - 'docs-merge-rtd-{stream}'
-      - 'docs-verify-rtd-{stream}'
-      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-rtd-jobs'
+      - gerrit-tox-verify
 
     stream:
+      - oxygen:
+          branch: master
       - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
+          branch: stable/nitrogen
       - carbon:
-          branch: 'stable/carbon'
-      - boron:
-          branch: 'stable/boron'
+          branch: stable/carbon
 
     project: docs
     project-name: docs
-    rtdproject: opendaylight
-    archive-artifacts: 'docs/_build/html/**'
-
-- job-template:
-    name: 'docs-merge-rtd-{stream}'
-    node: centos7-java-builder-2c-8g
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '30'
-
-    triggers:
-      - gerrit:
-          server-name: '{server-name}'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '**'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: docs/**/*.rst
-
-    builders:
-      - shell: !include-raw: docs-post-rtd.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[docs]'
-      - lf-infra-publish
-
-- job-template:
-    # FIXME: Describe this job in docs/jenkins.rst
-    name: 'docs-verify-rtd-{stream}'
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - git-scm-with-submodules:
-          branch: '{branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '**'
-          branch: '{branch}'
-          files: 'docs/**/*.rst'
-      - timed: 'H H * * *'
-
-    builders:
-      - shell: |
-          if [ "$GERRIT_PROJECT" != "docs" ]; then
-              cd docs/submodules/$GERRIT_PROJECT
-              git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
-          else
-              git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
-          fi
-      - shell: |
-          virtualenv $WORKSPACE/venv
-          source $WORKSPACE/venv/bin/activate
-          PYTHON="$WORKSPACE/venv/bin/python"
-          $PYTHON -m pip install --upgrade pip
-          $PYTHON -m pip freeze
-          $PYTHON -m pip install tox
-          tox -edocs
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[docs]'
-      - lf-infra-publish
+    build-node: centos7-builder-2c-8g
+    build-timeout: 30
+    rtd-project: opendaylight