summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml50
-rw-r--r--jjb/fuel/fuel-project-jobs.yml46
2 files changed, 46 insertions, 50 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