Merge "[doctor] fix node-label setting"

diff --git a/jjb/pharos/check-jinja2.yml b/jjb/pharos/check-jinja2.yml
index 8ee2a2a..49a2ba5 100644 (file)
--- a/jjb/pharos/check-jinja2.yml
+++ b/jjb/pharos/check-jinja2.yml
@@ -71,6 +71,8 @@
                   pattern: 'config/installers/**/*.j2'
                 - compare-type: ANT
                   pattern: 'check-jinja2.sh'
+                - compare-type: ANT
+                  pattern: 'check-schema.sh'
           skip-vote:
             successful: true
             failed: true
@@ -79,9 +81,15 @@
 
     builders:
       - check-pdf-jinja
+      - check-pdf-schema
 
 - builder:
     name: check-pdf-jinja
     builders:
       - shell: |
           $WORKSPACE/config/utils/check-jinja2.sh
+- builder:
+    name: check-pdf-schema
+    builders:
+      - shell: |
+          $WORKSPACE/config/utils/check-schema.sh

diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 4fbc6c4..b2421de 100755 (executable)
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -27,4 +27,4 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT
     exit 0
 fi
 
-echo "Hello World!"
+ssh -F $HOME/.ssh/xci-vm-config ${DISTRO}_xci_vm "cd releng-xci/xci && PATH=/home/devuser/.local/bin:$PATH ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/run-functest.yml"

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index af2432d..3c31456 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -253,7 +253,5 @@
 - builder:
     name: 'xci-verify-healthcheck-macro'
     builders:
-      - shell:
-          !include-raw: ./xci-run-functest.sh
       - shell:
           !include-raw: ./xci-cleanup.sh