diff --git a/Jenkinsfile2 b/Jenkinsfile2 index a3006c4f7d0dbbb1282ab6eaba4c66862f7723b0..f51ddbbac3a99f7755ade295f372b44e2d1ca2cc 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -33,7 +33,18 @@ def abort_previous(){ milestone(buildNumber) } def pre_test(){ - sh 'hostname' + sh ''' + hostname + date + ''' + sh ''' + cd ${WK} + git reset --hard + git fetch || git fetch + cd ${WKC} + git reset --hard + git fetch || git fetch + ''' script { if (env.CHANGE_TARGET == 'master') { sh ''' @@ -235,7 +246,7 @@ pipeline { sh ''' cd ${WKC}/tests/parallel_test date - time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${CHANGE_TARGET} -l ${WKDIR}/log + time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME} -l ${WKDIR}/log ''' } }