From feeba21edbe98c0bdea7a7ad47c3196aaa9a1870 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 22 Dec 2015 15:20:54 +0100 Subject: Take the fuel daily build job out of the main jobs Build should really not need to be driven by main jobs and work independently, continuously producing ISOs for whoever out there to consume. This needs review from Fuel Project in order to make sure the build process does not care whatever scenario we run and just builds all the plugins by default and put them into ISO. The trigger is set to poll fuel git repo every 6 hours and upload ISOs to artifacts.opnfv.org upon successful completion of the build. Change-Id: Id59e37407e219803925c146c811450fb6099031b Signed-off-by: Fatih Degirmenci --- jjb/fuel/fuel-ci-jobs.yml | 50 ------------------------------------------ jjb/fuel/fuel-project-jobs.yml | 46 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 50 deletions(-) (limited to 'jjb') 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}' ######################## @@ -102,13 +101,6 @@ branch: '{branch}' 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 @@ -132,48 +124,6 @@ current-parameters: true 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}' 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}' @@ -25,6 +26,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}' -- cgit 1.2.3-korg