Create Oxygen jobs and bump Nitrogen branch
[releng/builder.git] / jjb / releng-jobs.yaml
index 1de2a6e000cbf193201f3a07aa7f794973934756..69e6be6a9e45416d0448df84fdce509f65443f6f 100644 (file)
@@ -5,9 +5,6 @@
       - '{project-name}-ci-jobs'
       - '{project-name}-verify-tox-{stream}'
       - 'builder-check-poms'
-      # Packer jobs
-      - 'builder-verify-packer'
-      - 'builder-merge-packer-{platforms}-{templates}'
       # OpenStack Related
       - 'builder-cleanup-old-images'
       - 'builder-delete-stale-nodes'
       - '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
 
     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:
@@ -44,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
@@ -56,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
         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
           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
     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"
           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: >'"