summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/daisy4nfv')
-rw-r--r--jjb/daisy4nfv/daisy4nfv-merge-jobs.yml1
-rw-r--r--jjb/daisy4nfv/daisy4nfv-verify-jobs.yml1
-rwxr-xr-xjjb/daisy4nfv/daisy4nfv-virtual-deploy.sh4
3 files changed, 5 insertions, 1 deletions
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index f8c0258a6..5964adb32 100644
--- 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 d893b1485..bd9f1b51e 100644
--- 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 9de494fc2..4aa7b0bd5 100755
--- 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}