X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=d3597a20c560b6ea80de52f17fa6aa6eb4aa8d79;hb=57c23a32af24223b2101b70e50adf402de0fd8c2;hp=e55f672cc6b9991b4be9a9948493de15d562bf4c;hpb=99c81a81f8573f87affa9e1a68f92b83556480ce;p=releng%2Fbuilder.git diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index e55f672cc..d3597a20c 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -6,8 +6,9 @@ - builder-check-poms - gerrit-tox-verify # OpenStack Related - - 'builder-verify-image-visibility' + - '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 @@ -19,9 +20,9 @@ project-name: builder stream: master branch: master - build-node: centos7-java-builder-2c-4g + build-node: centos7-builder-2c-8g archive-artifacts: '**/*.log' - build-timeout: 10 + build-timeout: 30 - project: name: packer-jobs @@ -32,6 +33,7 @@ project-name: builder branch: master archive-artifacts: '**/*.log' + build-node: centos7-builder-2c-8g platforms: - centos @@ -43,20 +45,15 @@ - 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 @@ -67,10 +64,6 @@ 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,8 +84,6 @@ 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 @@ -108,7 +93,7 @@ - job-template: name: builder-check-poms - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g project-type: freestyle @@ -142,11 +127,9 @@ - job-template: - name: 'builder-verify-image-visibility' + name: 'builder-verify-image-protection' project-type: freestyle - node: centos7-java-builder-2c-4g - - os-cloud: 'odlpriv-sandbox' + node: centos7-builder-2c-8g properties: - opendaylight-infra-properties: @@ -170,16 +153,15 @@ # 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: - # Check images visibility on a daily schedule - timed: '@daily' builders: - shell: !include-raw-escape: - - opendaylight-infra-check-image-visibility.sh + - opendaylight-infra-check-image-protection.sh publishers: - email-notification: @@ -191,7 +173,7 @@ - job-template: name: 'builder-cleanup-old-images' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g properties: - opendaylight-infra-properties: @@ -215,7 +197,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: @@ -234,10 +216,49 @@ - lf-infra-publish +- job-template: + name: builder-delete-orphaned-nodes + project-type: freestyle + node: centos7-builder-2c-8g + + 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-java-builder-2c-4g + node: centos7-builder-2c-8g properties: - opendaylight-infra-properties: @@ -274,7 +295,7 @@ - job-template: name: 'builder-delete-stale-stacks' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g properties: - opendaylight-infra-properties: @@ -287,6 +308,10 @@ 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: @@ -309,7 +334,7 @@ - job-template: name: 'builder-update-image-list' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g properties: - opendaylight-infra-properties: @@ -317,7 +342,7 @@ parameters: - opendaylight-infra-parameters: - os-cloud: odlpriv + os-cloud: vex project: '{project}' branch: '{branch}' refspec: 'refs/heads/{branch}' @@ -333,7 +358,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: