diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2017-07-02 21:55:01 -0400 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2017-07-02 21:55:01 -0400 |
| commit | 667852687522ba836878da05a2734a7399b74e2e (patch) | |
| tree | 8ec49d67bdd798c5c07e47c5cfad2ec74954924c | |
| parent | f0999bee4dd3b410cd01a08ca28edc172aaf52bd (diff) | |
fix dovetail branch issue
error logs
https://build.opnfv.org/ci/view/dovetail/job/dovetail-fuel-baremetal-proposed_tests-danube/43/console
Change-Id: I0634041a0679fa7f3e6a4e6c627b3205a3b0372d
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 4 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 9fdce31f3..6bcaea26f 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -229,6 +229,10 @@ name: DOVETAIL_REPO_DIR default: "/home/opnfv/dovetail" description: "Directory where the dovetail repository is cloned" + - string: + name: SUT_BRANCH + default: '{branch}' + description: "SUT branch" scm: - git-scm diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index d423e9d29..85bc54d90 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -52,7 +52,12 @@ releng_repo=${WORKSPACE}/releng git clone https://gerrit.opnfv.org/gerrit/releng ${releng_repo} >/dev/null if [[ ${INSTALLER_TYPE} != 'joid' ]]; then + echo "SUT branch is $SUT_BRANCH" + echo "dovetail branch is $BRANCH" + BRANCH_BACKUP=$BRANCH + export BRANCH=$SUT_BRANCH ${releng_repo}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} >${redirect} + export BRANCH=$BRANCH_BACKUP fi if [[ -f $OPENRC ]]; then |