X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=40e718506777c87116aba02de418e29a242b43d6;hb=aac734585a5302a26a33ea34f03d0b66c96ed7f0;hp=4191a9cc2a859cdbeb16e485f1932e52612ba8ab;hpb=10821edc619b09e4623884b02900c39431f8a809;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 4191a9cc..40e71850 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,22 +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:
-          os-cloud-file-id: '{os-cloud-file-id}'
+          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}'
-          os-cloud-file-id: '{os-cloud-file-id}'
-          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:
-          os-cloud-file-id: '{os-cloud-file-id}'
+          packer-cloud-settings: '{packer-cloud-settings}'
           packer-version: '{packer-version}'
 
 - parameter:
@@ -394,6 +414,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
+      - timed: '00 10 1 * *'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on:
@@ -422,6 +443,7 @@
     # Default parameters #
     ######################
 
+    build-timeout: 10
     git-url: '$GIT_URL/$GERRIT_PROJECT'
 
     #####################
@@ -485,13 +507,14 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
+      - timed: '00 10 1 * *'
       - github
       - pollscm:
           cron: ''
       - lf-infra-github-pr-trigger:
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
-          status-context: 'JJB Merge'
+          status-context: 'Packer {platforms}-${templates} Merge'
           permit-all: false
           github-hooks: true
           github-org: '{github-org}'
@@ -508,6 +531,12 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_packer_verify_builders
 
+    ######################
+    # Default parameters #
+    ######################
+
+    build-timeout: 10
+
     #####################
     # Job Configuration #
     #####################
@@ -529,7 +558,7 @@
       - lf-infra-github-pr-trigger:
           trigger-phrase: '^recheck$'
           only-trigger-phrase: false
-          status-context: 'JJB Verify'
+          status-context: 'Packer Verify'
           permit-all: true
           github-hooks: true
           github-org: ''