X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=42e6d8aeea033a4c190c7041a73cbab9c0778fa7;hb=4122066983368fa56cfc45ce548ec70efae1416a;hp=450a132ec52b00df31527da9b148390d3e3f0be3;hpb=fc218e629fa473012b47c0c80a8707724d810caa;p=releng%2Fbuilder.git diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 450a132ec..42e6d8aee 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -2,20 +2,37 @@ - project: name: builder-jobs jobs: - - 'builder-verify-jjb' + - '{project-name}-ci-jobs' - '{project-name}-verify-tox-{stream}' - - 'builder-merge' - - 'builder-weekly' - '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: packer-jobs + # packer jobs templates are defined in global-jjb + jobs: + - '{project-name}-packer-jobs' + project: 'releng/builder' + project-name: builder + branch: master + archive-artifacts: '**/*.log' + platforms: - centos - ubuntu-14.04 @@ -23,13 +40,17 @@ templates: - devstack - - devstack-pre-pip-mitaka - - devstack-pre-pip-newton + - devstack-pre-pip-newton: + build-timeout: 75 + - devstack-pre-pip-ocata: + build-timeout: 60 - docker - gbp - - java-builder + - java-builder: + build-timeout: 75 - mininet - - mininet-ovs-2.5 + - mininet-ovs-2.5: + build-timeout: 60 - robot exclude: @@ -43,10 +64,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 @@ -57,10 +78,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 @@ -69,23 +90,14 @@ templates: mininet - platforms: ubuntu-16.04 templates: gbp - - - 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 + - platforms: ubuntu-16.04 + templates: baseline + - platforms: centos + templates: baseline - job-template: - name: builder-verify-jjb + name: builder-check-poms node: centos7-java-builder-2c-4g - concurrent: true project-type: freestyle @@ -101,123 +113,31 @@ refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - wrappers: - opendaylight-infra-wrappers: build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: 'jjb/**' + - timed: 'H H * * 1' builders: - - opendaylight-infra-jjbini - - shell: | - virtualenv $WORKSPACE/venv - source $WORKSPACE/venv/bin/activate - pip install --upgrade pip - pip install jenkins-job-builder - pip freeze - jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/ - gzip archives/job_output/* - - releng-check-unicode - - verify-gpg-signature + - shell: !include-raw-escape: include-raw-check-poms.sh publishers: - email-notification: email-recipients: '{email-recipients}' email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish -- job-template: - name: 'builder-merge' - node: centos7-java-builder-2c-4g - - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - - project-type: freestyle - - properties: - - opendaylight-infra-properties: - build-days-to-keep: 14 - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit: - server-name: '{server-name}' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng/builder' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: jjb/** - - builders: - - opendaylight-infra-jjbini - - shell: | - virtualenv $WORKSPACE/venv - source $WORKSPACE/venv/bin/activate - pip install --upgrade pip - pip install jenkins-job-builder - pip freeze - jenkins-jobs --version - jenkins-jobs update --recursive --delete-old --workers 4 jjb/ - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' - job-template: - name: 'builder-weekly' - disabled: false - node: centos7-java-builder-2c-4g - - # builder-weekly job to run JJB update weekly - # - # This job's purpose is to update all the JJB on a weekly (Sunday) - # basis with --flush-cache enabled to ensure jobs are okay - + name: 'builder-cleanup-old-images' project-type: freestyle + node: centos7-java-builder-2c-4g properties: - opendaylight-infra-properties: - build-days-to-keep: 14 + build-days-to-keep: 7 parameters: - opendaylight-infra-parameters: @@ -234,36 +154,36 @@ 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: - - timed: 'H H * * 0' + # Cleanup images on a weekly schedule + - timed: '@weekly' builders: - - opendaylight-infra-jjbini - - shell: | - virtualenv $WORKSPACE/venv - source $WORKSPACE/venv/bin/activate - pip install --upgrade pip - pip install jenkins-job-builder - pip freeze - jenkins-jobs --flush-cache update --recursive --workers 4 jjb/ + - 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]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish -- job-template: - name: builder-check-poms - node: centos7-java-builder-2c-4g +- job-template: + name: 'builder-delete-stale-nodes' project-type: freestyle + node: centos7-java-builder-2c-4g properties: - opendaylight-infra-properties: - build-days-to-keep: 14 + build-days-to-keep: 7 parameters: - opendaylight-infra-parameters: @@ -277,48 +197,24 @@ - opendaylight-infra-wrappers: build-timeout: '{build-timeout}' - triggers: - - timed: 'H H * * 1' - - builders: - - shell: !include-raw-escape: include-raw-check-poms.sh - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' - -- 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 - - 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 + - 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 @@ -334,32 +230,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' @@ -406,123 +293,7 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' - -- job-template: - name: 'builder-verify-packer' - project-type: freestyle - node: centos7-java-builder-2c-4g - concurrent: true - - properties: - - opendaylight-infra-properties: - build-days-to-keep: 14 - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: 'packer/**' - - builders: - - packer-validate: - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[{project}]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' - -- job-template: - name: 'builder-merge-packer-{platforms}-{templates}' - project-type: freestyle - node: centos7-java-builder-2c-4g - - properties: - - opendaylight-infra-properties: - build-days-to-keep: 14 - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - branches: - - '$GERRIT_BRANCH' - choosing-strategy: 'default' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - timed: '00 10 1 * *' - - gerrit: - server-name: '{server-name}' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng/builder' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'packer/vars/{platforms}.json' - - compare-type: ANT - pattern: 'packer/templates/{templates}.json' - - compare-type: ANT - pattern: 'packer/provision/{templates}.sh' - - compare-type: ANT - pattern: 'packer/provision/system_reseal.sh' - - compare-type: ANT - pattern: 'packer/provision/rh-user_data.sh' - - compare-type: ANT - pattern: 'packer/provision/devstack-pre-pip.sh' - - compare-type: ANT - pattern: 'packer/provision/baseline.sh' - - builders: - - packer-validate: - - packer-build: - platform: '{platforms}' - template: '{templates}' - - publishers: - - 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' @@ -560,7 +331,7 @@ triggers: - reverse: - jobs: 'builder-merge' + jobs: 'builder-jjb-merge' builders: - shell: | @@ -580,11 +351,11 @@ 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: >'" + file-with-changes-to-insert: "'csit_jobs_nitrogen.lst'" + file-to-change: "'jjb/releng-defaults.yaml'" - integration-replace-block-text: starting-regex: "'csit-list-carbon: >'" ending-regex: "'csit-list-boron: >'" @@ -592,13 +363,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 @@ -612,5 +378,4 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish