Merge "jjb: infra: bifrost-cleanup-job: Ignore jjb patchsets"

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

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index d3d2187..2d5ec4f 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -46,7 +46,7 @@
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'lf-build1'
+            default: 'lf-build2'
             description: 'Slave label on Jenkins'
         - project-parameter:
             project: '{project}'
@@ -56,7 +56,7 @@
             default: https://gerrit.opnfv.org/gerrit/opnfvdocs
             description: 'Git URL to use on this Jenkins Slave'
     scm:
-        - git-scm-gerrit:
+        - git-scm-with-submodules:
             branch: '{branch}'
 
     triggers:
@@ -69,23 +69,16 @@
 
     builders:
         - shell: |
-            git submodule update --init
             if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; 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
-            cd "$WORKSPACE"
-            for x in $(git submodule | awk '{{print $2}}');
-            do
-              cd "$x"
-              git filter-branch --subdirectory-filter docs/
-              cd -
-            done
-
         - shell: |
             sudo pip install virtualenv 
             virtualenv $WORKSPACE/venv
-            source $WORKSPACE/venv/bin/activate
+            . $WORKSPACE/venv/bin/activate
             pip install --upgrade pip
             pip freeze
             pip install tox