diff options
| -rw-r--r-- | jjb/genesis/genesis-foreman.yml | 17 | ||||
| -rw-r--r-- | jjb/genesis/genesis-fuel.yml | 23 |
2 files changed, 31 insertions, 9 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index 47e152196..8553bcff9 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -93,7 +93,6 @@ builders: - 'foreman-build' - - 'foreman-workspace-cleanup' - job-template: name: 'genesis-foreman-merge' @@ -153,7 +152,6 @@ builders: - 'foreman-build' - - 'foreman-workspace-cleanup' - job-template: name: 'genesis-foreman-daily-{stream}' @@ -164,6 +162,9 @@ disabled: false + triggers: + - 'foreman-{stream}' + parameters: - project-parameter: project: '{project}' @@ -194,6 +195,9 @@ - trigger-builds: - project: 'functest-opnfv-jump-2' block: true + - trigger-builds: + - project: 'yardstick-opnfv-jump-2' + block: true - job-template: name: 'genesis-foreman-build-{stream}' @@ -379,6 +383,7 @@ echo echo "--------------------------------------------------------" echo "Done!" + echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" - builder: name: 'foreman-workspace-cleanup' @@ -396,11 +401,11 @@ # trigger macros ######################## - trigger: - name: 'master' + name: 'foreman-master' triggers: - - pollscm: "0 9 * * *" + - pollscm: '0 21 * * *' - trigger: - name: 'stable-arno' + name: 'foreman-stable-arno' triggers: - - pollscm: "0 21 * * *" + - pollscm: '0 3 * * *' diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index 88ac66a18..9f00e5ded 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -96,7 +96,6 @@ builders: - 'fuel-build' - - 'fuel-workspace-cleanup' - job-template: name: 'genesis-fuel-merge' @@ -157,7 +156,6 @@ builders: - 'fuel-build' - - 'fuel-workspace-cleanup' - job-template: name: 'genesis-fuel-daily-{stream}' @@ -168,6 +166,9 @@ disabled: false + triggers: + - 'fuel-{stream}' + parameters: - project-parameter: project: '{project}' @@ -199,6 +200,9 @@ - trigger-builds: - project: 'functest-opnfv-jump-1' block: true + - trigger-builds: + - project: 'yardstick-opnfv-jump-1' + block: true - job-template: name: 'genesis-fuel-build-{stream}' @@ -229,7 +233,6 @@ builders: - 'fuel-build' - 'fuel-upload-artifact' - - 'fuel-workspace-cleanup' - job-template: name: 'genesis-fuel-deploy-{stream}' @@ -454,6 +457,7 @@ echo echo "--------------------------------------------------------" echo "Done!" + echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" - builder: name: 'fuel-download-artifact' @@ -500,3 +504,16 @@ # delete everything that is in $WORKSPACE /bin/rm -rf $WORKSPACE + +######################## +# trigger macros +######################## +- trigger: + name: 'fuel-master' + triggers: + - pollscm: '0 21 * * *' + +- trigger: + name: 'fuel-stable-arno' + triggers: + - pollscm: '0 3 * * *' |