Merge "Use new Ubuntu 16.04 image for deb Ansible tests"

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 02f5642dd7b13d3b8496196dca97c6c038d001e4..c42a8a028c4ec123db1186fd0d905666db53dbcc 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -495,7 +495,7 @@
           cd packer
           export PACKER_LOG="yes" && \
           export PACKER_LOG_PATH="packer-build.log" && \
-                      packer.io build -var-file=$CLOUDENV \
+                      packer.io build -color=false -var-file=$CLOUDENV \
                        -var-file=../packer/vars/{platform}.json \
                        ../packer/templates/{template}.json
 

diff --git a/jjb/requirements.txt b/jjb/requirements.txt
index 8f8e84ce5c01eb48bda9820e31b4f9a3fb37a198..c6ee1eab24d31ca84ce8100b3ef918dddb610941 100644 (file)
--- a/jjb/requirements.txt
+++ b/jjb/requirements.txt
@@ -1 +1 @@
-jenkins-job-builder==1.6.1
+jenkins-job-builder==1.6.2