From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Fri, 13 Apr 2018 16:19:30 +0000 (-0400)
Subject: Set default packer variable in job-template
X-Git-Tag: v0.19.0~9
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F9963%2F4;p=releng%2Fglobal-jjb.git

Set default packer variable in job-template

Also add documentation for the packer parameters macro.

Change-Id: Ib1532c508196ee3fabbac0137aeb0fd2e10904f4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst
index 8b1324a9..582508c0 100644
--- a/docs/jjb/lf-ci-jobs.rst
+++ b/docs/jjb/lf-ci-jobs.rst
@@ -96,6 +96,16 @@ lf-packer-common
 
 Common packer configuration.
 
+lf-infra-packer-parameters
+--------------------------
+
+Parameters useful for packer related tasks.
+
+:Parameters:
+
+    :packer-version: Version of packer to install / use.
+        (shell: PACKER_VERSION)
+
 Job Templates
 =============
 
diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 02d95404..20382811 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -20,8 +20,6 @@
 - job-group:
     name: '{project-name}-packer-jobs'
 
-    packer-version: 1.2.2
-
     jobs:
       - gerrit-packer-merge
       - gerrit-packer-verify
@@ -30,8 +28,6 @@
 - job-group:
     name: '{project-name}-github-packer-jobs'
 
-    packer-version: 1.2.2
-
     jobs:
       - github-packer-merge
       - github-packer-verify
@@ -86,6 +82,7 @@
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
+    packer-version: 1.2.2
 
     #####################
     # Job Configuration #