Merge "Increase ocata packer timeout from 60m to 75m"

diff --combined jjb/releng-jobs.yaml
index f6508f4090ab6623cbf1c9c8f0f89ec53b526d9c,d3597a20c560b6ea80de52f17fa6aa6eb4aa8d79..f54557e262e5554515b2f0b9d0badff7f50ec633
--- 1/jjb/releng-jobs.yaml
--- 2/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@@ -2,10 -2,8 +2,10 @@@
  - project:
      name: builder-jobs
      jobs:
 -      - '{project-name}-ci-jobs'
 +      - '{project-name}-ci-jobs':
 +          build-node: centos7-builder-2c-2g
        - builder-check-poms
 +      - builder-copy-sandbox-logs
        - gerrit-tox-verify
        # OpenStack Related
        - 'builder-verify-image-protection'
@@@ -22,10 -20,9 +22,10 @@@
      project-name: builder
      stream: master
      branch: master
 -    build-node: centos7-builder-2c-8g
 +    build-node: centos7-builder-2c-1g
      archive-artifacts: '**/*.log'
      build-timeout: 30
 +    jjb-version: 2.0.0
  
  - project:
      name: packer-jobs
@@@ -36,7 -33,7 +36,7 @@@
      project-name: builder
      branch: master
      archive-artifacts: '**/*.log'
 -    build-node: centos7-builder-2c-8g
 +    build-node: centos7-builder-2c-1g
  
      platforms:
        - centos
@@@ -48,10 -45,11 +48,10 @@@
        - 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
 -      - mininet
        - mininet-ovs-2.5:
            build-timeout: 60
        - mininet-ovs-2.6:
@@@ -60,6 -58,8 +60,6 @@@
      exclude:
        - platforms: centos
          templates: gbp
 -      - platforms: centos
 -        templates: mininet
        - platforms: centos
          templates: mininet-ovs-2.5
        - platforms: centos
@@@ -84,10 -84,16 +84,10 @@@
          templates: devstack-pre-pip-pike
        - platforms: ubuntu-16.04
          templates: devstack
 -      - platforms: ubuntu-16.04
 -        templates: mininet
 -      - platforms: ubuntu-16.04
 -        templates: baseline
 -      - platforms: centos
 -        templates: baseline
  
  - job-template:
      name: builder-check-poms
 -    node: centos7-builder-2c-8g
 +    node: centos7-builder-2c-1g
  
      project-type: freestyle
  
@@@ -119,52 -125,11 +119,52 @@@
            email-prefix: '[releng]'
        - lf-infra-publish
  
 +- job-template:
 +    name: builder-copy-sandbox-logs
 +    node: centos7-builder-2c-1g
 +
 +    project-type: freestyle
 +
 +    properties:
 +      - opendaylight-infra-properties:
 +          build-days-to-keep: 1
 +
 +    parameters:
 +      - opendaylight-infra-parameters:
 +          os-cloud: ''
 +          project: ''
 +          branch: ''
 +          refspec: ''
 +          artifacts: ''
 +
 +    wrappers:
 +      - opendaylight-infra-wrappers:
 +          build-timeout: 10
 +
 +    triggers:
 +      - gerrit:
 +          server-name: '{gerrit-server-name}'
 +          trigger-on:
 +            - comment-added-contains-event:
 +                comment-contains-value: 'copy-logs:'
 +          projects:
 +            - project-compare-type: ANT
 +              project-pattern: '**'
 +              branches:
 +                - branch-compare-type: ANT
 +                  branch-pattern: '**'
 +
 +    builders:
 +      - shell: !include-raw-escape: copy-sandbox-logs.sh
 +
 +    publishers:
 +      - lf-infra-publish
 +
  
  - job-template:
      name: 'builder-verify-image-protection'
      project-type: freestyle
 -    node: centos7-builder-2c-8g
 +    node: centos7-builder-2c-1g
  
      properties:
        - opendaylight-infra-properties:
@@@ -208,7 -173,7 +208,7 @@@
  - job-template:
      name: 'builder-cleanup-old-images'
      project-type: freestyle
 -    node: centos7-builder-2c-8g
 +    node: centos7-builder-2c-1g
  
      properties:
        - opendaylight-infra-properties:
@@@ -254,7 -219,7 +254,7 @@@
  - job-template:
      name: builder-delete-orphaned-nodes
      project-type: freestyle
 -    node: centos7-builder-2c-8g
 +    node: centos7-builder-2c-1g
  
      properties:
        - opendaylight-infra-properties:
@@@ -293,7 -258,7 +293,7 @@@
  - job-template:
      name: 'builder-delete-stale-nodes'
      project-type: freestyle
 -    node: centos7-builder-2c-8g
 +    node: centos7-builder-2c-1g
  
      properties:
        - opendaylight-infra-properties:
@@@ -330,7 -295,7 +330,7 @@@
  - job-template:
      name: 'builder-delete-stale-stacks'
      project-type: freestyle
 -    node: centos7-builder-2c-8g
 +    node: centos7-builder-2c-1g
  
      properties:
        - opendaylight-infra-properties:
@@@ -369,7 -334,7 +369,7 @@@
  - job-template:
      name: 'builder-update-image-list'
      project-type: freestyle
 -    node: centos7-builder-2c-8g
 +    node: centos7-builder-2c-1g
  
      properties:
        - opendaylight-infra-properties: