X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=caf99a049504cbff695f77928976d7bfd766de8e;hb=249f88b67d6ff34f7afb5409275edc41ba3ff9f2;hp=2f309173fb5edde835affdbc92d719e9a5afc2a2;hpb=b713b9e737b6261cf619552cb9aac059946a5488;p=releng%2Fbuilder.git diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 2f309173f..caf99a049 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -5,15 +5,36 @@ - '{project-name}-ci-jobs' - '{project-name}-verify-tox-{stream}' - 'builder-check-poms' - - 'builder-verify-packer' - - 'builder-merge-packer-{platforms}-{templates}' # OpenStack Related - 'builder-cleanup-old-images' + - 'builder-delete-stale-nodes' - 'builder-delete-stale-stacks' # Automation for docs and jobs - 'builder-update-csit-tests' - 'builder-update-image-list' + # The following values are only specified here + # so that code blocks look similar to other projects. + project: 'releng/builder' + project-name: builder + stream: master + branch: master + build-node: centos7-java-builder-2c-4g + archive-artifacts: '**/*.log' + build-timeout: 10 + +- project: + name: builder-packer-jobs + jobs: + - 'builder-merge-packer-{platforms}-{templates}' + - 'builder-verify-packer' + + project: 'releng/builder' + project-name: builder + branch: master + archive-artifacts: '**/*.log' + build-timeout: 90 + platforms: - centos - ubuntu-14.04 @@ -21,8 +42,8 @@ templates: - devstack - - devstack-pre-pip-mitaka - devstack-pre-pip-newton + - devstack-pre-pip-ocata - docker - gbp - java-builder @@ -41,10 +62,10 @@ templates: java-builder - platforms: ubuntu-14.04 templates: robot - - platforms: ubuntu-14.04 - templates: devstack-pre-pip-mitaka - platforms: ubuntu-14.04 templates: devstack-pre-pip-newton + - platforms: ubuntu-14.04 + templates: devstack-pre-pip-ocata - platforms: ubuntu-14.04 templates: devstack - platforms: ubuntu-14.04 @@ -55,10 +76,10 @@ templates: java-builder - platforms: ubuntu-16.04 templates: robot - - platforms: ubuntu-16.04 - templates: devstack-pre-pip-mitaka - platforms: ubuntu-16.04 templates: devstack-pre-pip-newton + - platforms: ubuntu-16.04 + templates: devstack-pre-pip-ocata - platforms: ubuntu-16.04 templates: devstack - platforms: ubuntu-16.04 @@ -67,20 +88,12 @@ templates: mininet - platforms: ubuntu-16.04 templates: gbp + - platforms: ubuntu-16.04 + templates: baseline + - platforms: centos + templates: baseline - project-type: freestyle - archive-artifacts: '**/*.log' - build-timeout: '60' - - # The following values are only specified here - # so that code blocks look similar to other projects. - project: 'releng/builder' - project-name: builder - stream: master - branch: master - build-node: centos7-java-builder-2c-4g - - job-template: name: builder-check-poms node: centos7-java-builder-2c-4g @@ -113,11 +126,57 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish + - job-template: - name: 'builder-delete-stale-stacks' + name: 'builder-cleanup-old-images' + 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}' + + 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: opendaylight-private-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 @@ -125,6 +184,14 @@ - 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}' @@ -134,17 +201,19 @@ - timed: '0,30 * * * *' builders: - - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh + - 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]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish + - job-template: - name: 'builder-cleanup-old-images' + name: 'builder-delete-stale-stacks' project-type: freestyle node: centos7-java-builder-2c-4g @@ -160,32 +229,23 @@ 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: opendaylight-private-clouds-yaml - target: '$HOME/.config/openstack/clouds.yaml' triggers: - # Cleanup images on a weekly schedule - - timed: '@weekly' + # 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-old-images.sh + - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh publishers: - email-notification: email-recipients: '{email-recipients}' email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish + - job-template: name: 'builder-update-image-list' @@ -232,8 +292,7 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish - job-template: name: 'builder-verify-packer' @@ -276,8 +335,7 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish - job-template: name: 'builder-merge-packer-{platforms}-{templates}' @@ -347,8 +405,7 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish - job-template: name: 'builder-update-csit-tests' @@ -406,11 +463,6 @@ search_string: "csit" stream: "boron" jobs-filename: "csit_jobs_boron.lst" - - integration-list-jobs: - blacklist: '{csit-list-blacklist}' - search_string: "csit" - stream: "beryllium" - jobs-filename: "csit_jobs_beryllium.lst" - integration-replace-block-text: starting-regex: "'csit-list-nitrogen: >'" ending-regex: "'csit-list-carbon: >'" @@ -423,13 +475,8 @@ file-to-change: "'jjb/releng-defaults.yaml'" - integration-replace-block-text: starting-regex: "'csit-list-boron: >'" - ending-regex: "'csit-list-beryllium: >'" - file-with-changes-to-insert: "'csit_jobs_boron.lst'" - file-to-change: "'jjb/releng-defaults.yaml'" - - integration-replace-block-text: - starting-regex: "'csit-list-beryllium: >'" ending-regex: "'# CSIT TESTS END SED MARKER'" - file-with-changes-to-insert: "'csit_jobs_beryllium.lst'" + file-with-changes-to-insert: "'csit_jobs_boron.lst'" file-to-change: "'jjb/releng-defaults.yaml'" - shell: | git status @@ -443,5 +490,4 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish