Merge "doctor: copy log file to 'tests' dir"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 8bfc53d..6011fe7 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -59,6 +59,7 @@
          - 'os-odl_l2-nofeature-ha'
          - 'os-odl_l2-bgpvpn-ha'
          - 'os-odl_l2-fdio-noha'
+         - 'os-odl_l2-fdio-ha'
          - 'os-odl_l2-sfc-noha'
          - 'os-odl_l3-nofeature-ha'
          - 'os-onos-nofeature-ha'
@@ -97,6 +98,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -153,6 +155,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -744,7 +747,7 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-noha-{stream}'
+          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-{stream}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-build-{stream}/build
               OPNFV_CLEAN=yes
@@ -756,7 +759,7 @@
         - trigger-builds:
           - project: 'functest-apex-{daily-slave}-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-fdio-noha
+              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
             block: true
             same-node: true
             block-thresholds:
@@ -766,7 +769,7 @@
         - trigger-builds:
           - project: 'yardstick-apex-{slave}-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-fdio-noha
+              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
             block: true
             same-node: true
             block-thresholds:

diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index e0631c4..4df9acf 100755 (executable)
--- a/jjb/armband/armband-deploy.sh
+++ b/jjb/armband/armband-deploy.sh
@@ -71,10 +71,23 @@ ISO_FILE=$WORKSPACE/opnfv.iso
 # log file name
 FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
 
+# Deploy Cache (to enable just create the deploy-cache subdir)
+# NOTE: Only available when ISO files are cached using ISOSTORE mechanism
+DEPLOY_CACHE=${ISOSTORE:-/iso_mount/opnfv_ci}/${GIT_BRANCH##*/}/deploy-cache
+if [[ -d "${DEPLOY_CACHE}" ]]; then
+    echo "Deploy cache dir present."
+    echo "--------------------------------------------------------"
+    echo "Fuel@OPNFV deploy cache: ${DEPLOY_CACHE}"
+    DEPLOY_CACHE="-C ${DEPLOY_CACHE}"
+else
+    DEPLOY_CACHE=""
+fi
+
 # construct the command
 DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \
     -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \
-    -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
+    -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
+    ${DEPLOY_CACHE}"
 
 # log info to console
 echo "Deployment parameters"

diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index 90fdd7e..f99ed57 100644 (file)
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -68,6 +68,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index c42efff..485010d 100644 (file)
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index 523d363..27eb01a 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -54,6 +54,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -94,6 +95,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index cc04ad3..9382144 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -79,6 +79,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index a5f556a..15a3b59 100644 (file)
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index b504578..80ad929 100644 (file)
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index f8c0258..5964adb 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -64,6 +64,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index d893b14..bd9f1b5 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -62,6 +62,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
index 9de494f..4aa7b0b 100755 (executable)
--- a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
+++ b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
@@ -10,7 +10,9 @@ if [[ "$NODE_NAME" =~ "-virtual" ]]; then
     export NETWORK_CONF=./deploy/config/vm_environment/$NODE_NAME/network.yml
     export DHA_CONF=./deploy/config/vm_environment/$NODE_NAME/deploy.yml
 else
-    exit 1
+    # TODO: For the time being, we need to pass this script to let contributors merge their work.
+    echo "No support for non-virtual node"
+    exit 0
 fi
 
 ./ci/deploy/deploy.sh ${DHA_CONF} ${NETWORK_CONF}

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index c00b255..7a5bd22 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -48,6 +48,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -132,6 +133,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/domino/domino.yml b/jjb/domino/domino.yml
index 7cee984..d34f8fa 100644 (file)
--- a/jjb/domino/domino.yml
+++ b/jjb/domino/domino.yml
@@ -36,6 +36,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml
index 41fd8cd..07106f6 100644 (file)
--- a/jjb/dovetail/dovetail-project-jobs.yml
+++ b/jjb/dovetail/dovetail-project-jobs.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -79,6 +80,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index c660af5..bcad2a3 100644 (file)
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/escalator/escalator.yml b/jjb/escalator/escalator.yml
index dba76f7..11da789 100644 (file)
--- a/jjb/escalator/escalator.yml
+++ b/jjb/escalator/escalator.yml
@@ -60,6 +60,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -188,6 +189,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml
index 40df385..6be6a52 100644 (file)
--- a/jjb/fastpathmetrics/fastpathmetrics.yml
+++ b/jjb/fastpathmetrics/fastpathmetrics.yml
@@ -42,6 +42,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -100,6 +101,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 588ab0c..2aa17ab 100644 (file)
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -114,6 +114,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -186,6 +187,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/fuel/fuel-verify-jobs-experimental.yml b/jjb/fuel/fuel-verify-jobs-experimental.yml
index ae83b08..cc16133 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs-experimental.yml
+++ b/jjb/fuel/fuel-verify-jobs-experimental.yml
@@ -73,6 +73,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index f4bdbdd..7b86568 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -68,6 +68,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index 236b95d..888f0ed 100644 (file)
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index d9dafdf..069599e 100644 (file)
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml
index 9d362d8..649c31b 100644 (file)
--- a/jjb/joid/joid-verify-jobs.yml
+++ b/jjb/joid/joid-verify-jobs.yml
@@ -73,6 +73,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 04fce22..4cba6d1 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -66,6 +66,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -168,6 +169,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/moon/moon.yml b/jjb/moon/moon.yml
index 55d593f..a52cf2c 100644 (file)
--- a/jjb/moon/moon.yml
+++ b/jjb/moon/moon.yml
@@ -29,6 +29,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -53,4 +54,4 @@
         - shell:
             #!/bin/bash
             echo "launch Moon unit tests"
-            nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit
\ No newline at end of file
+            nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit

diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml
index 24c03fd..8e54299 100644 (file)
--- a/jjb/multisite/multisite.yml
+++ b/jjb/multisite/multisite.yml
@@ -46,6 +46,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/netready/netready.yml b/jjb/netready/netready.yml
index 3e2f95a..cc6769e 100644 (file)
--- a/jjb/netready/netready.yml
+++ b/jjb/netready/netready.yml
@@ -34,6 +34,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index c4e34ca..741aa09 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -39,6 +39,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml
index 0c90c57..33ede47 100644 (file)
--- a/jjb/onosfw/onosfw.yml
+++ b/jjb/onosfw/onosfw.yml
@@ -43,6 +43,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 2bf87c2..724ef6a 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -49,6 +49,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -96,6 +97,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index c6f3e4a..28d2683 100644 (file)
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -42,6 +42,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -96,6 +97,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 7f73a13..cd6c6e0 100644 (file)
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index f7ea622..92216ee 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index a95cd98..951188c 100644 (file)
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml
index 1a4d628..f620f6f 100644 (file)
--- a/jjb/promise/promise.yml
+++ b/jjb/promise/promise.yml
@@ -40,6 +40,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml
index f192e86..8b406fe 100644 (file)
--- a/jjb/qtip/qtip-project-jobs.yml
+++ b/jjb/qtip/qtip-project-jobs.yml
@@ -37,6 +37,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/releng/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml
index 442e8ea..a183745 100644 (file)
--- a/jjb/releng/opnfv-docs.yml
+++ b/jjb/releng/opnfv-docs.yml
@@ -46,6 +46,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -98,6 +99,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index 652f282..c2624de 100644 (file)
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -43,6 +43,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index ccfe11e..fc77c2d 100644 (file)
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -23,6 +23,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -77,6 +78,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 026b643..4e72af5 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -43,6 +43,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -106,6 +107,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
index c988c06..6dd3acf 100644 (file)
--- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
+++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
@@ -34,6 +34,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 5f952de..cda5128 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -85,6 +85,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -148,6 +149,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index abc6eeb..afa6b78 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -45,6 +45,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -88,6 +89,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
index 63d8514..6e751fe 100755 (executable)
--- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
@@ -18,7 +18,7 @@ ENABLE_VENV="false"
 USE_DHCP="false"
 USE_VENV="false"
 BUILD_IMAGE=true
-PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-2400}
+PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600}
 
 # Set defaults for ansible command-line options to drive the different
 # tests.

diff --git a/utils/test/testapi/opnfv_testapi/resources/testcase_models.py b/utils/test/testapi/opnfv_testapi/resources/testcase_models.py
index c9dce60..e1f2fb6 100644 (file)
--- a/utils/test/testapi/opnfv_testapi/resources/testcase_models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/testcase_models.py
@@ -41,7 +41,8 @@ class TestcaseUpdateRequest(object):
 
 @swagger.model()
 class Testcase(object):
-    def __init__(self):
+    def __init__(self, _id=None, name=None, project_name=None,
+                 description=None, url=None, creation_date=None):
         self._id = None
         self.name = None
         self.project_name = None