Validate only template/platform that is built

No point validating every combination of template/platform in a
merge job that is only interested in building a single combo.

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

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 0c2ae33..70c662c 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -950,9 +950,6 @@
     #####################
 
     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}'

diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index 34c4014..1caca8e 100644 (file)
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -32,6 +32,10 @@ fi
 
 export PACKER_LOG="yes"
 export PACKER_LOG_PATH="$PACKER_BUILD_LOG"
+packer.io validate \
+    -var-file="$CLOUDENV" \
+    -var-file="$platform_file" \
+    "templates/$PACKER_TEMPLATE.json"
 packer.io build -color=false \
     -var-file="$CLOUDENV" \
     -var-file="$platform_file" \