From a3df1881110c7975b17ede3fbf9098a553c3a4e8 Mon Sep 17 00:00:00 2001
From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Wed, 1 Feb 2017 07:16:37 -0800
Subject: Packer validate does not support -color=false

Additionally: cleanup packer-merge steps for the validate as it
no-longer does a specific validation against one template but all

Change-Id: Ie906dbcb110c6c19c731a5e3d66ec596c0273676
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---
 jjb/ci-management/ci-management-macros.yaml | 2 +-
 jjb/ci-management/ci-management.yaml        | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/jjb/ci-management/ci-management-macros.yaml b/jjb/ci-management/ci-management-macros.yaml
index c4eef5d26..648177345 100644
--- a/jjb/ci-management/ci-management-macros.yaml
+++ b/jjb/ci-management/ci-management-macros.yaml
@@ -18,7 +18,7 @@
               for t in $templates; do
                   export PACKER_LOG="yes" && \
                   export PACKER_LOG_PATH="packer-validate-${{v##*/}}-${{t##*/}}.log" && \
-                              packer.io validate -var-file=$CLOUDENV -color=false \
+                              packer.io validate -var-file=$CLOUDENV \
                               -var-file=$v $t
                   if [ $? -ne 0 ]; then
                       break
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index f78323ed3..5bdd7a5b9 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -196,9 +196,7 @@
           files: 'packer/**'
 
     builders:
-      - packer-validate:
-          platform: '{platforms}'
-          template: '{templates}'
+      - packer-validate
       - packer-build:
           platform: '{platforms}'
           template: '{templates}'
-- 
cgit 1.2.3-korg