Revert "Add new jobs for doc merge and verify"

This reverts commit fd8d915b212fb8adc943a74b537b5b5efffeaaad.

Change-Id: I9e56196f2ac84b72af2f9b51bbcd663fdc4e02c3

3 files changed, 5 insertions, 80 deletions

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 175d82fb4..29c1527d2 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -72,8 +72,9 @@
     triggers:
         - timed: ''
 
+# NOTE: unused macro, but we may use this for some jobs.
 - trigger:
-    name: gerrit-trigger-patchset-created
+    name: gerrit-trigger-patch-submitted
     triggers:
         - gerrit:
             server-name: 'gerrit.opnfv.org'
@@ -87,13 +88,13 @@
                     comment-contains-value: 'recheck'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: '{project}'
+                project-pattern: '{name}'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
 
 - trigger:
-    name: gerrit-trigger-change-merged
+    name: gerrit-trigger-patch-merged
     triggers:
         - gerrit:
             server-name: 'gerrit.opnfv.org'
@@ -103,7 +104,7 @@
                     comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: '{project}'
+                project-pattern: '{name}'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
diff --git a/jjb/opnfvdocs/docs-post-rtd.sh b/jjb/opnfvdocs/docs-post-rtd.sh
deleted file mode 100644
index 7faa26f38..000000000
--- a/jjb/opnfvdocs/docs-post-rtd.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-if [ $GERRIT_BRANCH == "master" ]; then
-    RTD_BUILD_VERSION=latest
-else
-    RTD_BUILD_VERSION=${{GERRIT_BRANCH/\//-}}
-fi
-curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/{rtdproject}
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
deleted file mode 100644
index 7ff8cd162..000000000
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-- project:
-    name: docs-rtd
-    jobs:
-        - 'docs-merge-rtd-{stream}'
-        - 'docs-verify-rtd-{stream}'
-
-    stream:
-        - danube:
-            branch: 'master'
-        - colorado:
-            branch: 'stable/colorado'
-
-    project: 'opnfvdocs'
-    rtdproject: 'opnfv'
-    # TODO: Archive Artifacts
-
-- job-template:
-    name: 'docs-merge-rtd-{stream}'
-
-    project-type: freestyle
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-    scm:
-        - git-scm
-
-    triggers:
-        - gerrit-trigger-change-merged
-
-    builders:
-        - shell: !include-raw: docs-post-rtd.sh
-
-- job-template:
-    name: 'docs-verify-rtd-{stream}'
-
-    project-type: freestyle
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-    scm:
-        - git-scm
-
-    triggers:
-        - gerrit-trigger-patchset-created:
-            server: 'gerrit.opnfv.org'
-            project: '**'
-            branch: '{branch}'
-            files: 'docs/**/*.rst'
-        - timed: 'H H * * *'
-
-    builders:
-        - shell: |
-            if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; then
-                cd opnfvdocs/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
-            pip install --upgrade pip
-            pip freeze
-            pip install tox
-            tox -edocs
\ No newline at end of file