X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=c1f41b551893eb4f417825a15077a9884d40de90;hb=fdd432a1ea8e3e563b887d8764f119cb0fae6448;hp=f6508f4090ab6623cbf1c9c8f0f89ec53b526d9c;hpb=173097062f3a3a0ec816c6d1a475fb50dfd326f5;p=releng%2Fbuilder.git diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index f6508f409..c1f41b551 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -4,15 +4,12 @@ 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-protection' - - 'builder-cleanup-old-images' - - 'builder-delete-orphaned-nodes' - - 'builder-delete-stale-nodes' - - 'builder-delete-stale-stacks' # Automation for docs and jobs - 'builder-update-image-list' @@ -26,6 +23,9 @@ archive-artifacts: '**/*.log' build-timeout: 30 jjb-version: 2.0.0 + jenkins-urls: > + https://jenkins.opendaylight.org/releng + https://jenkins.opendaylight.org/sandbox - project: name: packer-jobs @@ -48,7 +48,7 @@ - devstack-pre-pip-newton: build-timeout: 75 - devstack-pre-pip-ocata: - build-timeout: 60 + build-timeout: 75 - devstack-pre-pip-pike: build-timeout: 75 - gbp @@ -162,73 +162,41 @@ - job-template: - name: 'builder-verify-image-protection' - project-type: freestyle - node: centos7-builder-2c-1g - - 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}' - - scm: - - git-scm: - branch: '{branch}' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - # Listed after to override openstack-infra-wrappers clouds.yaml definition - - config-file-provider: - files: - - file-id: clouds-yaml - target: '$HOME/.config/openstack/clouds.yaml' - - triggers: - - timed: '@daily' - - builders: - - shell: !include-raw-escape: - - opendaylight-infra-check-image-protection.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-builder-2c-1g + 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: @@ -236,136 +204,22 @@ 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-orphaned-nodes - project-type: freestyle - node: centos7-builder-2c-1g - - 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}' - - string: - name: JENKINS_URLS - default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox' - description: 'Space separated list of Jenkins URLs to check for active builds' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # Attempt to clear up servers every 30 mins in case we have orphaned servers - - timed: '0,30 * * * *' - - builders: - - shell: !include-raw-escape: opendaylight-infra-cleanup-orphaned-nodes.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-builder-2c-1g - - 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 - - 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-builder-2c-1g - - 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}' - - string: - name: JENKINS_URLS - default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox' - description: 'Space separated list of Jenkins URLs to check for active builds' - - 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 + - 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-update-image-list' project-type: freestyle