X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=e9e483ea70f65e7e8fbfa5cb11e1d9487fa8535f;hb=d8e3dc493b1ba8b5a462887c6fa90a51c86bedc2;hp=4fd2c0c8ee6d8016ea352b88ff5f80dcb2da2e9b;hpb=33acf6e113cf0f9fa8ce4bfa1df9df5473c28c41;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 4fd2c0c8..e9e483ea 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -1,49 +1,4 @@
 ---
-- job-group:
-    name: '{project-name}-ci-jobs'
-
-    jobs:
-      - gerrit-jenkins-cfg-merge
-      - gerrit-jenkins-sandbox-cleanup
-      - gerrit-jjb-deploy-job
-      - gerrit-jjb-merge
-      - gerrit-jjb-verify
-
-- job-group:
-    name: '{project-name}-github-ci-jobs'
-
-    jobs:
-      - github-jenkins-cfg-merge
-      - github-jenkins-sandbox-cleanup
-      - github-jjb-deploy-job
-      - github-jjb-merge
-      - github-jjb-verify
-
-- job-group:
-    name: '{project-name}-info-yaml-jobs'
-
-    jobs:
-      - gerrit-info-yaml-verify
-
-- job-group:
-    name: '{project-name}-github-info-yaml-jobs'
-
-    jobs:
-      - github-info-yaml-verify
-
-- job-group:
-    name: '{project-name}-packer-jobs'
-
-    jobs:
-      - gerrit-packer-merge
-      - gerrit-packer-verify
-
-- job-group:
-    name: '{project-name}-github-packer-jobs'
-
-    jobs:
-      - github-packer-merge
-      - github-packer-verify
 
 ####################
 # COMMON FUNCTIONS #
@@ -77,11 +32,12 @@
     branch: master
     build-timeout: 90
     cron: '@monthly'
+    disable-job: false
     github-url: 'https://github.com'
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
-    packer-version: 1.2.3
+    packer-version: 1.2.5
 
     #####################
     # Job Configuration #
@@ -89,6 +45,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -137,6 +94,7 @@
 
     branch: master
     build-timeout: 10
+    disable-job: false
     github-url: 'https://github.com'
     jjb-version: 2.2.1
     stream: master
@@ -171,6 +129,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -207,6 +166,7 @@
     ######################
 
     branch: master
+    disable-job: false
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     stream: master
     gerrit_merge_triggers:
@@ -219,6 +179,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -295,6 +256,7 @@
 
     branch: master
     cron: '@daily'
+    disable-job: false
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     github-url: 'https://github.com'
     jenkins-silos: production sandbox
@@ -319,6 +281,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: false
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -430,6 +393,7 @@
     build-timeout: 30
     # Run every Saturday at 08:00 UTC
     cron: '0 8 * * 6'
+    disable-job: false
 
     #####################
     # Job Configuration #
@@ -438,6 +402,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     parameters:
       - lf-infra-jjb-parameters:
@@ -480,6 +445,7 @@
     ######################
 
     branch: master
+    disable-job: false
     # jjb-deploy should always clone $PROJECT regardless of what
     # $GERRIT_PROJECT triggered the job.
     git-url: '$GIT_URL/$PROJECT'
@@ -496,6 +462,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -888,6 +855,7 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 15
+    disable-job: false
     file-patterns: >
         *.go
         *.groovy
@@ -910,6 +878,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -1116,6 +1085,7 @@
     build-days-to-keep: 7
     build-timeout: 10
     cron: '@daily'
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     openstack-cloud: vex
@@ -1128,6 +1098,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: false
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -1201,12 +1172,30 @@
 - lf_packer_merge: &lf_packer_merge
     name: lf-packer-merge
 
+    ######################
+    # Default parameters #
+    ######################
+
+    openstack: true
+    openstack-cloud: vex
+
     #####################
     # Job Configuration #
     #####################
 
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+          lftools-version: '{lftools-version}'
+      - lf-packer-parameters:
+          packer-version: '{packer-version}'
+
     builders:
       - lf-infra-packer-build:
+          openstack: '{openstack}'
+          openstack-cloud: '{openstack-cloud}'
           packer-cloud-settings: '{packer-cloud-settings}'
           packer-version: '{packer-version}'
           platform: '{platforms}'