summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2016-12-09 01:12:38 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-09 01:12:38 +0000
commit5a34ee766833177cf01b0e32dda48a994c3c681f (patch)
tree555d55b4049c40599e1feb9fece7436b4dfa6dcf /jjb/compass4nfv
parentdab7761d9f7d49c41eccd9be781fc995fa788dbb (diff)
parentd7ad5696f8bf4db10adb17e173aada45822f26dd (diff)
Merge "Adjust log path"
Diffstat (limited to 'jjb/compass4nfv')
-rw-r--r--jjb/compass4nfv/compass-deploy.sh2
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml1
2 files changed, 1 insertions, 2 deletions
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 017741ae6..c8d6159a2 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -50,7 +50,7 @@ fi
export DHA=${DHA_CONF}
export NETWORK=${NETWORK_CONF}
-./ci/deploy_ci.sh
+source ./ci/deploy_ci.sh
if [ $? -ne 0 ]; then
echo "depolyment failed!"
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index a883ad9a8..69cc958a8 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -138,7 +138,6 @@
current-parameters: true
predefined-parameters: |
COMPASS_OS_VERSION={os-version}
- COMPASS_OS_VERSION_OPTION={openstack-os-version}
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true