diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 3 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 38 | ||||
| -rw-r--r-- | jjb/barometer/barometer.yml | 16 | ||||
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 2 |
4 files changed, 13 insertions, 46 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 861b713a0..ae2186002 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -593,6 +593,9 @@ current-parameters: true predefined-parameters: | OPNFV_CLEAN=yes + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: FAILURE abort-all-job: true git-revision: false diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 1df6e154c..3f10e214b 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -593,6 +593,9 @@ current-parameters: true predefined-parameters: | OPNFV_CLEAN=yes + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: FAILURE abort-all-job: true git-revision: false @@ -929,30 +932,6 @@ abort-all-job: true git-revision: false -- job-template: - name: 'apex-gs-clean-{stream}' - - # Job template for clean - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - node: '{slave}' - - disabled: false - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - apex-parameter: - gs-pathname: '{gs-pathname}' - - builders: - - 'apex-gs-clean' - - triggers: - - 'apex-gs-clean-{stream}' - ######################## # parameter macros ######################## @@ -1029,12 +1008,6 @@ !include-raw: ./apex-download-artifact.sh - builder: - name: 'apex-gs-cleanup' - builders: - - shell: - !include-raw: ./apex-gs-cleanup.sh - -- builder: name: 'apex-deploy' builders: - shell: @@ -1051,7 +1024,4 @@ name: 'apex-danube' triggers: - timed: '0 12 * * *' -- trigger: - name: 'apex-gs-clean-{stream}' - triggers: - - timed: '0 2 * * *' + diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml index 9ec30e809..68b8a04c0 100644 --- a/jjb/barometer/barometer.yml +++ b/jjb/barometer/barometer.yml @@ -126,21 +126,16 @@ disabled: '{obj:disabled}' - concurrent: true + concurrent: false properties: - logrotate-default - - throttle: - enabled: true - max-total: 3 - max-per-node: 2 - option: 'project' parameters: - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - 'opnfv-build-centos-defaults' scm: - git-scm @@ -151,7 +146,6 @@ builders: - shell: | pwd - cd src - ./install_build_deps.sh - make clobber - make + cd ci + ./install_dependencies.sh + ./build_rpm.sh diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index d8574904c..f581f2604 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -54,7 +54,7 @@ echo "Functest: Start Docker and prepare environment" echo "Functest: Download images that will be used by test cases" images_dir="${HOME}/opnfv/functest/images" chmod +x ${WORKSPACE}/functest/ci/download_images.sh -${WORKSPACE}/functest/ci/download_images.sh ${images_dir} +${WORKSPACE}/functest/ci/download_images.sh ${images_dir} 2> ${redirect} images_vol="-v ${images_dir}:/home/opnfv/functest/images" dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" |