X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=42e6d8aeea033a4c190c7041a73cbab9c0778fa7;hb=4122066983368fa56cfc45ce548ec70efae1416a;hp=f45a61a8be9389c5b63eea48f7460e60be162363;hpb=4365a26d27b4ce3ca1f03c7a6d270c0658cfed88;p=releng%2Fbuilder.git diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index f45a61a8b..42e6d8aee 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -5,15 +5,34 @@ - '{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: 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 @@ -21,12 +40,17 @@ templates: - devstack - - 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: @@ -42,6 +66,8 @@ templates: robot - 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 @@ -54,6 +80,8 @@ templates: robot - 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 @@ -62,19 +90,10 @@ 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 - build-node: centos7-java-builder-2c-4g + - platforms: ubuntu-16.04 + templates: baseline + - platforms: centos + templates: baseline - job-template: name: builder-check-poms @@ -108,35 +127,8 @@ - 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 * * * *' + - lf-infra-publish - builders: - - 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' - job-template: name: 'builder-cleanup-old-images' @@ -173,17 +165,19 @@ - timed: '@weekly' builders: - - shell: !include-raw-escape: opendaylight-infra-cleanup-old-images.sh + - 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-update-image-list' + name: 'builder-delete-stale-nodes' project-type: freestyle node: centos7-java-builder-2c-4g @@ -193,52 +187,40 @@ parameters: - opendaylight-infra-parameters: - os-cloud: odlpriv + 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: - # Update image list every Monday to Friday at 11:00 UTC - - timed: '0 11 * * 1-5' + # Attempt to clear up stacks every 30 mins in case we have orphaned stacks + - timed: '0,30 * * * *' builders: - - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh - - opendaylight-infra-push-gerrit-patch: - project: '{project}' - gerrit-topic: 'releng-update-cloud-image-list' - gerrit-commit-message: 'Update cloud image list docs' + - 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-verify-packer' + name: 'builder-delete-stale-stacks' project-type: freestyle node: centos7-java-builder-2c-4g - concurrent: true properties: - opendaylight-infra-properties: - build-days-to-keep: 14 + build-days-to-keep: 7 parameters: - opendaylight-infra-parameters: @@ -248,102 +230,70 @@ 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/**' + # Attempt to clear up stacks every 30 mins in case we have orphaned stacks + - timed: '0,30 * * * *' builders: - - packer-validate: + - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh publishers: - email-notification: email-recipients: '{email-recipients}' - email-prefix: '[{project}]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + email-prefix: '[releng]' + - lf-infra-publish + - job-template: - name: 'builder-merge-packer-{platforms}-{templates}' + name: 'builder-update-image-list' 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: - os-cloud: '{os-cloud}' + os-cloud: odlpriv project: '{project}' branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - branches: - - '$GERRIT_BRANCH' - choosing-strategy: 'default' + - 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: - - 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' + # Update image list every Monday to Friday at 11:00 UTC + - timed: '0 11 * * 1-5' builders: - - packer-validate: - - packer-build: - platform: '{platforms}' - template: '{templates}' + - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh + - opendaylight-infra-push-gerrit-patch: + project: '{project}' + gerrit-topic: 'releng-update-cloud-image-list' + gerrit-commit-message: 'Update cloud image list docs' publishers: - email-notification: email-recipients: '{email-recipients}' - email-prefix: '[{project}]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + email-prefix: '[releng]' + - lf-infra-publish - job-template: name: 'builder-update-csit-tests' @@ -401,11 +351,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: >'" @@ -418,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 @@ -438,5 +378,4 @@ - email-notification: email-recipients: '{email-recipients}' email-prefix: '[releng]' - - opendaylight-infra-shiplogs: - maven-version: 'mvn33' + - lf-infra-publish