X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=c1f41b551893eb4f417825a15077a9884d40de90;hb=4dd0f93bdcc602f444719a3b5c95a5447866af85;hp=e55f672cc6b9991b4be9a9948493de15d562bf4c;hpb=99c81a81f8573f87affa9e1a68f92b83556480ce;p=releng%2Fbuilder.git diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index e55f672cc..c1f41b551 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -2,14 +2,14 @@ - project: name: builder-jobs jobs: - - '{project-name}-ci-jobs' + - '{project-name}-ci-jobs': + build-node: centos7-builder-2c-2g + build-timeout: 60 + jenkins-silos: releng sandbox - builder-check-poms + - builder-copy-sandbox-logs + - builder-openstack-cron - gerrit-tox-verify - # OpenStack Related - - 'builder-verify-image-visibility' - - 'builder-cleanup-old-images' - - 'builder-delete-stale-nodes' - - 'builder-delete-stale-stacks' # Automation for docs and jobs - 'builder-update-image-list' @@ -19,9 +19,13 @@ project-name: builder stream: master branch: master - build-node: centos7-java-builder-2c-4g + build-node: centos7-builder-2c-1g archive-artifacts: '**/*.log' - build-timeout: 10 + build-timeout: 30 + jjb-version: 2.0.0 + jenkins-urls: > + https://jenkins.opendaylight.org/releng + https://jenkins.opendaylight.org/sandbox - project: name: packer-jobs @@ -32,6 +36,7 @@ project-name: builder branch: master archive-artifacts: '**/*.log' + build-node: centos7-builder-2c-1g platforms: - centos @@ -43,34 +48,22 @@ - devstack-pre-pip-newton: build-timeout: 75 - devstack-pre-pip-ocata: - build-timeout: 60 + build-timeout: 75 - devstack-pre-pip-pike: build-timeout: 75 - - docker: - build-timeout: 60 - gbp - - java-builder: - build-timeout: 75 - - mininet - mininet-ovs-2.5: build-timeout: 60 - mininet-ovs-2.6: build-timeout: 75 - - robot exclude: - platforms: centos templates: gbp - - platforms: centos - templates: mininet - platforms: centos templates: mininet-ovs-2.5 - platforms: centos templates: mininet-ovs-2.6 - - platforms: ubuntu-14.04 - templates: java-builder - - platforms: ubuntu-14.04 - templates: robot - platforms: ubuntu-14.04 templates: devstack-pre-pip-newton - platforms: ubuntu-14.04 @@ -79,16 +72,10 @@ templates: devstack-pre-pip-pike - platforms: ubuntu-14.04 templates: devstack - - platforms: ubuntu-14.04 - templates: docker - platforms: ubuntu-14.04 templates: mininet-ovs-2.5 - platforms: ubuntu-14.04 templates: mininet-ovs-2.6 - - platforms: ubuntu-16.04 - templates: java-builder - - platforms: ubuntu-16.04 - templates: robot - platforms: ubuntu-16.04 templates: devstack-pre-pip-newton - platforms: ubuntu-16.04 @@ -97,18 +84,10 @@ templates: devstack-pre-pip-pike - platforms: ubuntu-16.04 templates: devstack - - platforms: ubuntu-16.04 - templates: docker - - platforms: ubuntu-16.04 - templates: mininet - - platforms: ubuntu-16.04 - templates: baseline - - platforms: centos - templates: baseline - job-template: name: builder-check-poms - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-1g project-type: freestyle @@ -140,176 +119,111 @@ email-prefix: '[releng]' - lf-infra-publish - - job-template: - name: 'builder-verify-image-visibility' - project-type: freestyle - node: centos7-java-builder-2c-4g + name: builder-copy-sandbox-logs + node: centos7-builder-2c-1g - os-cloud: 'odlpriv-sandbox' + project-type: freestyle properties: - opendaylight-infra-properties: - build-days-to-keep: 7 + build-days-to-keep: 1 parameters: - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - scm: - - git-scm: - branch: '{branch}' + os-cloud: '' + project: '' + branch: '' + refspec: '' + artifacts: '' wrappers: - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - # Listed after to override openstack-infra-wrappers clouds.yaml definition - - config-file-provider: - files: - - file-id: opendaylight-private-clouds-yaml - target: '$HOME/.config/openstack/clouds.yaml' + build-timeout: 10 triggers: - # Check images visibility on a daily schedule - - timed: '@daily' + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'copy-logs:' + projects: + - project-compare-type: ANT + project-pattern: '**' + branches: + - branch-compare-type: ANT + branch-pattern: '**' builders: - - shell: !include-raw-escape: - - opendaylight-infra-check-image-visibility.sh + - shell: !include-raw-escape: copy-sandbox-logs.sh publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - lf-infra-publish - job-template: - name: 'builder-cleanup-old-images' + name: builder-openstack-cron project-type: freestyle - node: centos7-java-builder-2c-4g + node: '{build-node}' properties: - - opendaylight-infra-properties: + - lf-infra-properties: build-days-to-keep: 7 parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' + - lf-infra-parameters: project: '{project}' + stream: '{stream}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + lftools-version: '{lftools-version}' + - string: + name: OS_CLOUD + default: '{os-cloud}' + description: Artifacts to archive to the logs server. + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + - string: + name: JENKINS_URLS + default: '{jenkins-urls}' + description: 'Space separated list of Jenkins URLs to check for active builds' scm: - git-scm: branch: '{branch}' wrappers: - - opendaylight-infra-wrappers: + - lf-infra-wrappers: build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' # Listed after to override openstack-infra-wrappers clouds.yaml definition - config-file-provider: files: - - file-id: opendaylight-private-clouds-yaml + - file-id: clouds-yaml target: '$HOME/.config/openstack/clouds.yaml' triggers: - # Cleanup images on a weekly schedule - - timed: '@weekly' - - builders: - - shell: !include-raw-escape: - - global-jjb/shell/lftools-install.sh - - opendaylight-infra-cleanup-old-images.sh - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - - lf-infra-publish - - -- job-template: - name: 'builder-delete-stale-nodes' - project-type: freestyle - node: centos7-java-builder-2c-4g - - properties: - - opendaylight-infra-properties: - build-days-to-keep: 7 - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # Attempt to clear up stacks every 30 mins in case we have orphaned stacks - timed: '0,30 * * * *' builders: - - shell: !include-raw-escape: - - global-jjb/shell/lftools-install.sh - - opendaylight-infra-cleanup-stale-nodes.sh + - odl-openstack-install + - shell: !include-raw-escape: global-jjb/shell/lftools-install.sh + # Servers + - odl-openstack-cleanup-stale-stacks + - odl-openstack-cleanup-stale-nodes + - odl-openstack-cleanup-orphaned-nodes + # Images + - odl-openstack-check-image-protection + - odl-openstack-cleanup-old-images publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - lf-infra-publish - -- job-template: - name: 'builder-delete-stale-stacks' - project-type: freestyle - node: centos7-java-builder-2c-4g - - properties: - - opendaylight-infra-properties: - build-days-to-keep: 7 - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # Attempt to clear up stacks every 30 mins in case we have orphaned stacks - - timed: '0,30 * * * *' - - builders: - - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - - lf-infra-publish - - - job-template: name: 'builder-update-image-list' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-1g properties: - opendaylight-infra-properties: @@ -317,7 +231,7 @@ parameters: - opendaylight-infra-parameters: - os-cloud: odlpriv + os-cloud: vex project: '{project}' branch: '{branch}' refspec: 'refs/heads/{branch}' @@ -333,7 +247,7 @@ # Listed after to override openstack-infra-wrappers clouds.yaml definition - config-file-provider: files: - - file-id: opendaylight-private-clouds-yaml + - file-id: clouds-yaml target: '$HOME/.config/openstack/clouds.yaml' triggers: