Merge "Fix chown in jenkins slave connection script"

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 9848eed..51a6ba6 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -159,15 +159,25 @@
 
             _get_title_script="
             import os
-            from docutils import core
+            from docutils import core, nodes
             with open('index.rst', 'r') as file:
                 data = file.read()
-                doctree = core.publish_doctree(data,
-                    settings_overrides={'report_level': 5,
-                                        'halt_level': 5})
-                print doctree[0].astext()"
+            doctree = core.publish_doctree(data,
+                settings_overrides={'report_level': 5,
+                                    'halt_level': 5})
+            if isinstance(doctree[0], nodes.title):
+                title = doctree[0]
+            else:
+                for c in doctree.children:
+                    if isinstance(c, nodes.section):
+                        title = c[0]
+                        break
+            print title.astext()"
             _git_sha1="$(git rev-parse HEAD)"
 
+            git clone ssh://gerrit.opnfv.org:29418/releng
+            [[ -d releng ]]
+
             find docs/ -name 'index.rst' -printf '%h\n' | while read dir
             do
                 _name="${dir##*/}"
@@ -183,11 +193,11 @@
                 sed -i "s/_sha1_/$_git_sha1/g" "$dir/index.rst"
 
                 if [[ ! -f "$dir/conf.py" ]] ; then
-                    cp "docs/etc/conf.py" "$dir/conf.py"
+                    cp releng/docs/etc/conf.py "$dir/conf.py"
                     _title=$(cd $dir; python -c "$_get_title_script")
                     echo "latex_documents = [('index', '$_name.tex', '$_title', 'OPNFV', 'manual'),]" >> "$dir/conf.py"
                 fi
-                cp -f "docs/etc/opnfv-logo.png" "$dir/opnfv-logo.png"
+                cp -f releng/docs/etc/opnfv-logo.png "$dir/opnfv-logo.png"
 
                 mkdir -p "$_output"
 

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 681541d..1d50911 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -16,7 +16,7 @@
 - job-template:
     name: 'storperf-verify-{stream}'
 
-    node: ericsson-build
+    node: intel-jp-build-1
 
     project-type: freestyle
 
@@ -77,7 +77,7 @@
     #
     # This job's purpose is to update all the JJB
 
-    node: ericsson-build
+    node: intel-jp-build-1
 
     project-type: freestyle
 
@@ -137,7 +137,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: ericsson-build
+    node: intel-jp-build-1
 
     disabled: true