X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=69e6be6a9e45416d0448df84fdce509f65443f6f;hb=4aaa45a1cafdf3191f28a3885a7010fa966a6bda;hp=1a686edc38d563cf60e931a8a3d3946947a0d8a1;hpb=35a169b2784a6567c9dc43e77192c682d21d9b33;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 1a686edc3..69e6be6a9 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -24,16 +24,14 @@
     build-timeout: 10
 
 - project:
-    name: builder-packer-jobs
+    name: packer-jobs
+    # packer jobs templates are defined in global-jjb
     jobs:
-      - 'builder-merge-packer-{platforms}-{templates}'
-      - 'builder-verify-packer'
-
+      - '{project-name}-packer-jobs'
     project: 'releng/builder'
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
-    build-timeout: 90
 
     platforms:
       - centos
@@ -42,13 +40,17 @@
 
     templates:
       - devstack
-      - devstack-pre-pip-newton
-      - devstack-pre-pip-ocata
+      - 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:
@@ -88,7 +90,10 @@
         templates: mininet
       - platforms: ubuntu-16.04
         templates: gbp
-
+      - platforms: ubuntu-16.04
+        templates: baseline
+      - platforms: centos
+        templates: baseline
 
 - job-template:
     name: builder-check-poms
@@ -290,119 +295,6 @@
           email-prefix: '[releng]'
       - lf-infra-publish
 
-- 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}]'
-      - lf-infra-publish
-
-- 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}]'
-      - lf-infra-publish
-
 - job-template:
     name: 'builder-update-csit-tests'
     node: centos7-java-builder-2c-8g
@@ -444,6 +336,11 @@
     builders:
       - shell: |
           git checkout -b auto-update-csit-jobs
+      - integration-list-jobs:
+          blacklist: '{csit-list-blacklist}'
+          search_string: "csit"
+          stream: "oxygen"
+          jobs-filename: "csit_jobs_oxygen.lst"
       - integration-list-jobs:
           blacklist: '{csit-list-blacklist}'
           search_string: "csit"
@@ -459,6 +356,11 @@
           search_string: "csit"
           stream: "boron"
           jobs-filename: "csit_jobs_boron.lst"
+      - integration-replace-block-text:
+          starting-regex: "'csit-list-oxygen: >'"
+          ending-regex: "'csit-list-nitrogen: >'"
+          file-with-changes-to-insert: "'csit_jobs_oxygen.lst'"
+          file-to-change: "'jjb/releng-defaults.yaml'"
       - integration-replace-block-text:
           starting-regex: "'csit-list-nitrogen: >'"
           ending-regex: "'csit-list-carbon: >'"