diff options
| -rw-r--r-- | jjb/genesis/genesis-foreman.yml | 93 | ||||
| -rw-r--r-- | jjb/genesis/genesis-fuel.yml | 100 |
2 files changed, 151 insertions, 42 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index 6b05ea7ab..c5c4035e4 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -15,6 +15,7 @@ - 'genesis-foreman-daily-{stream}' - 'genesis-foreman-build-{stream}' - 'genesis-foreman-deploy-{stream}' + - 'genesis-foreman-lab-reconfig-{stream}' - 'genesis-foreman-deploy-runner-{stream}' - 'genesis-foreman-deploy-virtual-{stream}' @@ -164,7 +165,7 @@ node: ericsson-build - disabled: false + disabled: true triggers: - 'foreman-{stream}' @@ -175,6 +176,7 @@ - foreman-parameter: installer: '{installer}' gs-pathname: '{gs-pathname}' + scm: - git-scm: credentials-id: '{ssh-credentials}' @@ -192,16 +194,67 @@ - project: 'genesis-foreman-build-{stream}' git-revision: true block: true -# - trigger-builds: -# - project: 'genesis-foreman-deploy-runner-{stream}' -# git-revision: true -# block: true -# - trigger-builds: -# - project: 'functest-opnfv-jump-2' -# block: true -# - trigger-builds: -# - project: 'yardstick-opnfv-jump-2' -# block: true + - trigger-builds: + - project: 'genesis-foreman-lab-reconfig-{stream}' + git-revision: true + block: true + - trigger-builds: + - project: 'genesis-foreman-deploy-{stream}' + git-revision: true + block: true + - trigger-builds: + - project: 'functest-opnfv-jump-2' + block: true + - trigger-builds: + - project: 'yardstick-opnfv-jump-2' + block: true + +- job-template: + name: 'genesis-foreman-deploy-runner-{stream}' + + project-type: freestyle + + disabled: false + + node: master + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + parameters: + - project-parameter: + project: '{project}' + - foreman-parameter: + installer: '{installer}' + gs-pathname: '{gs-pathname}' + - string: + name: GIT_BASE + default: ssh://gerrit.opnfv.org:29418/$PROJECT + description: "Used for overriding the GIT URL coming from parameters macro." + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "genesis-fuel-daily.*" + - "genesis-fuel-deploy-runner-{stream}" + - "genesis-foreman-daily.*" + + builders: + - 'foreman-lab-reconfig' + - trigger-builds: + - project: 'genesis-foreman-deploy-{stream}' + git-revision: true + block: true - job-template: name: 'genesis-foreman-build-{stream}' @@ -269,7 +322,7 @@ - 'foreman-deploy' - job-template: - name: 'genesis-foreman-deploy-runner-{stream}' + name: 'genesis-foreman-lab-reconfig-{stream}' project-type: freestyle @@ -300,12 +353,14 @@ refspec: '' branch: '{branch}' + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "genesis-fuel-daily.*" + builders: - 'foreman-lab-reconfig' - - trigger-builds: - - project: 'genesis-foreman-deploy-{stream}' - git-revision: true - block: true - job-template: name: 'genesis-foreman-deploy-virtual-{stream}' @@ -435,8 +490,8 @@ done if [ "$ping_flag" -eq 1 ]; then - echo "Slave is pingable, now wait 60 seconds for services to start" - sleep 60 + echo "Slave is pingable, now wait 90 seconds for services to start" + sleep 90 else echo "Slave did not come back up after reboot: please check opnfv-jump-2" exit 1 @@ -588,4 +643,4 @@ - trigger: name: 'foreman-stable-arno' triggers: - - pollscm: '0 3 * * *' + - pollscm: '0 1 * * *' diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index c050adcdf..56c9f7021 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -15,8 +15,9 @@ - 'genesis-fuel-daily-{stream}' - 'genesis-fuel-build-{stream}' - 'genesis-fuel-deploy-{stream}' - - 'genesis-fuel-deploy-virtual-master' - 'genesis-fuel-deploy-runner-{stream}' + - 'genesis-fuel-lab-reconfig-{stream}' + - 'genesis-fuel-deploy-virtual-{stream}' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) @@ -167,7 +168,7 @@ node: ericsson-build - disabled: false + disabled: true triggers: - 'fuel-{stream}' @@ -196,16 +197,67 @@ - project: 'genesis-fuel-build-{stream}' git-revision: true block: true -# - trigger-builds: -# - project: 'genesis-fuel-deploy-runner-{stream}' -# git-revision: true -# block: true -# - trigger-builds: -# - project: 'functest-opnfv-jump-1' -# block: true -# - trigger-builds: -# - project: 'yardstick-opnfv-jump-1' -# block: true + - trigger-builds: + - project: 'genesis-fuel-lab-reconfig-{stream}' + git-revision: true + block: true + - trigger-builds: + - project: 'genesis-fuel-deploy-{stream}' + git-revision: true + block: true + - trigger-builds: + - project: 'functest-opnfv-jump-1' + block: true + - trigger-builds: + - project: 'yardstick-opnfv-jump-1' + block: true + +- job-template: + name: 'genesis-fuel-deploy-runner-{stream}' + + project-type: freestyle + + disabled: false + + node: master + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + parameters: + - project-parameter: + project: '{project}' + - foreman-parameter: + installer: '{installer}' + gs-pathname: '{gs-pathname}' + - string: + name: GIT_BASE + default: ssh://gerrit.opnfv.org:29418/$PROJECT + description: "Used for overriding the GIT URL coming from parameters macro." + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "genesis-foreman-daily.*" + - "genesis-foreman-deploy-runner-{stream}" + - "genesis-fuel-daily.*" + + builders: + - 'fuel-lab-reconfig' + - trigger-builds: + - project: 'genesis-fuel-deploy-{stream}' + git-revision: true + block: true - job-template: name: 'genesis-fuel-build-{stream}' @@ -275,7 +327,7 @@ - 'fuel-deploy' - job-template: - name: 'genesis-fuel-deploy-runner-{stream}' + name: 'genesis-fuel-lab-reconfig-{stream}' project-type: freestyle @@ -306,15 +358,17 @@ refspec: '' branch: '{branch}' + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "genesis-foreman-daily.*" + builders: - 'fuel-lab-reconfig' - - trigger-builds: - - project: 'genesis-fuel-deploy-{stream}' - git-revision: true - block: true - job-template: - name: 'genesis-fuel-deploy-virtual-master' + name: 'genesis-fuel-deploy-virtual-{stream}' project-type: freestyle @@ -333,7 +387,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: master + branch: 'master' logrotate: daysToKeep: 30 @@ -618,8 +672,8 @@ done if [ "$ping_flag" -eq 1 ]; then - echo "Slave is pingable, now wait 60 seconds for services to start" - sleep 60 + echo "Slave is pingable, now wait 90 seconds for services to start" + sleep 90 else echo "Slave did not come back up after reboot: please check opnfv-jump-2" exit 1 @@ -638,9 +692,9 @@ - trigger: name: 'fuel-master' triggers: - - timed: '0 21 * * *' + - timed: '0 5 * * *' - trigger: name: 'fuel-stable-arno' triggers: - - timed: '0 3 * * *' + - timed: '0 9 * * *' |