diff options
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 50 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 46 | ||||
| -rw-r--r-- | jjb/ovsnfv/ovsnfv.yml | 16 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 4 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 10 |
5 files changed, 65 insertions, 61 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index bcc3248c1..888287909 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -53,7 +53,6 @@ jobs: - 'fuel-{sdn-controller}-{pod}-daily-{stream}' - - 'fuel-build-{pod}-daily-{stream}' - 'fuel-deploy-{pod}-daily-{stream}' ######################## @@ -103,13 +102,6 @@ builders: - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'fuel-build-{pod}-daily-{stream}' - git-revision: true - kill-phase-on: FAILURE - - multijob: name: deploy condition: SUCCESSFUL projects: @@ -133,48 +125,6 @@ kill-phase-on: NEVER - job-template: - name: 'fuel-build-{pod}-daily-{stream}' - - concurrent: false - - properties: - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - - parameters: - - project-parameter: - project: '{project}' - - 'ericsson-ca-build-1-defaults' - - '{installer}-defaults' - - fuel-ci-parameter: - gs-pathname: '{gs-pathname}' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - wrappers: - - timeout: - timeout: 360 - fail: true - - builders: - - shell: - !include-raw ./fuel-build.sh - - shell: - !include-raw ./fuel-upload-artifact.sh - - shell: - !include-raw ./fuel-workspace-cleanup.sh - - publishers: - - email: - recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com - -- job-template: name: 'fuel-deploy-{pod}-daily-{stream}' concurrent: false diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index a55c785c4..50df1bdd2 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -18,6 +18,7 @@ # gs-pathname: '/{stream}' jobs: + - 'fuel-build-daily-{stream}' - 'fuel-verify-build-{stream}' - 'fuel-merge-build-{stream}' - 'fuel-merge-deploy-virtual-{stream}' @@ -26,6 +27,51 @@ # job templates ######################## - job-template: + name: 'fuel-build-daily-{stream}' + + concurrent: false + + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + + parameters: + - project-parameter: + project: '{project}' + - 'ericsson-ca-build-1-defaults' + - '{installer}-defaults' + - fuel-project-parameter: + gs-pathname: '{gs-pathname}' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + triggers: + - pollscm: '0 H/6 * * *' + + wrappers: + - timeout: + timeout: 360 + fail: true + + builders: + - shell: + !include-raw ./fuel-build.sh + - shell: + !include-raw ./fuel-upload-artifact.sh + - shell: + !include-raw ./fuel-workspace-cleanup.sh + + publishers: + - email: + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com + +- job-template: name: 'fuel-verify-build-{stream}' concurrent: true diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index c01d7ae18..f29219c97 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -11,11 +11,11 @@ # only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' # - brahmaputra: # branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' +# gs-pathname: '/{stream}' - job-template: name: 'ovsnfv-verify-{stream}' @@ -26,6 +26,10 @@ - gerrit-parameter: branch: '{branch}' - 'intel-us-build-2-defaults' + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." scm: - gerrit-trigger-scm: @@ -71,6 +75,10 @@ - gerrit-parameter: branch: '{branch}' - 'intel-us-build-2-defaults' + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." scm: - gerrit-trigger-scm: @@ -110,8 +118,8 @@ - 'intel-us-build-2-defaults' - string: name: GS_URL - default: gs://$GS_BASE{gs-pathname} - description: "URL to Google Storage." + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." scm: - git-scm: diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index b94fd8fa2..8d6f55193 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -9,11 +9,11 @@ description: "JJB configured PROJECT parameter to identify an opnfv Gerrit project" - string: name: GS_BASE - default: artifacts.opnfv.org/$PROJECT/ + default: artifacts.opnfv.org/$PROJECT description: "URL to Google Storage." - string: name: GS_BASE_PROXY - default: build.opnfv.org/artifacts/$PROJECT/ + default: build.opnfv.org/artifacts/$PROJECT description: "URL to Google Storage proxy" - parameter: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 470bf68b9..0ef6c9b3f 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -133,7 +133,7 @@ -e "POD_NAME=${NODE_NAME}" \ -e "EXTERNAL_NETWORK=net04_ext" \ opnfv/yardstick \ - run_tests.sh \ + run_tests.sh $YARDSTICK_DB_BACKEND \ $YARDSTICK_SUITE_NAME echo "Yardstick: done!" @@ -177,7 +177,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: 'none' + default: '' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -185,7 +185,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: 'none' + default: '' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -193,7 +193,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: 'db_args' + default: '-r 213.77.62.197' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -201,5 +201,5 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: 'none' + default: '' description: 'Arguments to use in order to choose the backend DB' |