X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=1ad02f35f225fc22cc5fc83636874dc67690a8c0;hb=11679542b3d7adde0a37c894a7422f72311c8c66;hp=0a5d771396491df188f90d36a7d6bc9b5b424cc9;hpb=04163ad187f5da1063953ff301da2761c65d304e;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 0a5d7713..1ad02f35 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -105,9 +105,17 @@
 - lf_packer: &lf_packer_common
     name: lf-packer-common
     # Adds wrappers and parameters sections common to packer jobs.
+
+    ######################
+    # Default parameters #
+    ######################
+
+    build-timeout: 45
+    packer-cloud-settings: packer-cloud-env
+
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: 60
+          build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     parameters:
@@ -121,19 +129,34 @@
 - lf_packer_merge_builders: &lf_packer_merge_builders
     name: lf-packer-merge-builders
     # Adds builders section common to merge packer jobs.
+    # {packer-cloud-settings} is passed from the project, defines the managed
+    #                   file-id name created in Jenkins
+    #                   (default: packer-cloud-env)
+    # {packer-version}: is global defined in job group level, the version number
+    #                   can be updated to install the latest version of packer.
+    # {platforms}:      defines the packer platform file, passed from the project.
+    # {template}:       defines the packer template file, passed from the project.
     builders:
       - lf-infra-packer-validate:
+          packer-cloud-settings: '{packer-cloud-settings}'
           packer-version: '{packer-version}'
       - lf-infra-packer-build:
+          packer-cloud-settings: '{packer-cloud-settings}'
+          packer-version: '{packer-version}'
           platform: '{platforms}'
           template: '{templates}'
-          packer-version: '{packer-version}'
 
 - lf_packer_verify_builders: &lf_packer_verify_builders
     # Adds builders section common to verify packer jobs.
+    # {packer-cloud-settings} is passed from the project, defines the managed
+    #                   file-id name created in Jenkins
+    #                   (default: packer-cloud-env)
+    # {packer-version}: is global defined in job group level, the version number
+    #                   can be updated to install the latest version of packer.
     name: lf-packer-verify-builders
     builders:
       - lf-infra-packer-validate:
+          packer-cloud-settings: '{packer-cloud-settings}'
           packer-version: '{packer-version}'
 
 - parameter:
@@ -419,6 +442,7 @@
     # Default parameters #
     ######################
 
+    build-timeout: 10
     git-url: '$GIT_URL/$GERRIT_PROJECT'
 
     #####################
@@ -505,6 +529,12 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_packer_verify_builders
 
+    ######################
+    # Default parameters #
+    ######################
+
+    build-timeout: 10
+
     #####################
     # Job Configuration #
     #####################