diff options
-rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/calipso/calipso.yml | 2 | ||||
-rw-r--r-- | jjb/ci_gate_security/anteater-report-to-gerrit.sh | 2 | ||||
-rw-r--r-- | jjb/fuel/fuel-daily-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 2 | ||||
-rw-r--r-- | jjb/qtip/qtip-validate-jobs.yml | 5 |
6 files changed, 9 insertions, 6 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 4c2656067..0154c7a71 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -148,7 +148,7 @@ label: '{scenario}' steps: - trigger-builds: - - project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}' + - project: 'dovetail-{installer}-{pod}-proposed_tests-master' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} diff --git a/jjb/calipso/calipso.yml b/jjb/calipso/calipso.yml index c282efa73..ede40021f 100644 --- a/jjb/calipso/calipso.yml +++ b/jjb/calipso/calipso.yml @@ -23,7 +23,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-centos-defaults' scm: diff --git a/jjb/ci_gate_security/anteater-report-to-gerrit.sh b/jjb/ci_gate_security/anteater-report-to-gerrit.sh index a749d1db4..de1fdd745 100644 --- a/jjb/ci_gate_security/anteater-report-to-gerrit.sh +++ b/jjb/ci_gate_security/anteater-report-to-gerrit.sh @@ -13,7 +13,7 @@ if [[ -e securityaudit.log ]] ; then EXITSTATUS=1 fi - awk -F"ERROR - " '{print $2}' securityaudit.log | sed -e "s/\"/\\\\\"/g;s/\'/\\\\/g"> shortlog + grep 'ERROR' securityaudit.log | awk -F"ERROR - " '{ print $2 }' | tr -d "\'\"" > shortlog ssh -p 29418 gerrit.opnfv.org \ "gerrit review -p $GERRIT_PROJECT \ diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml index 3ca6d05d9..323cf7464 100644 --- a/jjb/fuel/fuel-daily-jobs.yml +++ b/jjb/fuel/fuel-daily-jobs.yml @@ -204,7 +204,7 @@ label: '{scenario}' steps: - trigger-builds: - - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}' + - project: 'dovetail-fuel-{pod}-proposed_tests-master' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 2055da969..0198179f2 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -20,7 +20,7 @@ disabled: false - 'test': slave-label: 'intel-pod10' - disabled: true + disabled: false ##################################### # patch verification phases ##################################### diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index 50b773ff8..cd77d0a09 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -76,7 +76,10 @@ default: '{qpi}' - string: name: TESTAPI_URL - defaut: 'http://testresults.opnfv.org/test/api/v1' + default: 'http://testresults.opnfv.org/test/api/v1' + - string: + name: OPNFV_RELEASE + default: '{stream}' scm: - git-scm |