Migrate packer jobs to use global-jjb templates

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index caf99a049504cbff695f77928976d7bfd766de8e..887fd7bb4e6fc4574cfda8372c3af91177163b22 100644 (file)
--- 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,8 +40,10 @@
 
     templates:
       - devstack
-      - devstack-pre-pip-newton
-      - devstack-pre-pip-ocata
+      - devstack-pre-pip-newton:
+          build-timeout: 60
+      - devstack-pre-pip-ocata:
+          build-timeout: 60
       - docker
       - gbp
       - java-builder
@@ -93,7 +93,6 @@
       - platforms: centos
         templates: baseline
 
-
 - job-template:
     name: builder-check-poms
     node: centos7-java-builder-2c-4g
@@ -294,119 +293,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