diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-02-01 07:16:37 -0800 |
|---|---|---|
| committer | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-02-01 07:18:32 -0800 |
| commit | a3df1881110c7975b17ede3fbf9098a553c3a4e8 (patch) | |
| tree | a216e7c5becb559619142a9de80b7319d4a00325 | |
| parent | adec00beb548b87eb58808722fa86bf430d45863 (diff) | |
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>
| -rw-r--r-- | jjb/ci-management/ci-management-macros.yaml | 2 | ||||
| -rw-r--r-- | 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}' |