Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix default platform location to common-packer
[releng/global-jjb.git]
/
.jjb-test
/
expected-xml
/
gerrit-ciman-packer-merge-ubuntu1604-java-builder
diff --git
a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
index
26e90b0
..
ebcd8ae
100644
(file)
--- a/
.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
+++ b/
.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
@@
-387,7
+387,7
@@
mkdir -p "$PACKER_LOGS_DIR"
export PATH="${WORKSPACE}/bin:$PATH"
# Prioritize the project's own version of vars if available
export PATH="${WORKSPACE}/bin:$PATH"
# Prioritize the project's own version of vars if available
-platform_file="vars/$PACKER_PLATFORM.json"
+platform_file="
common-packer/
vars/$PACKER_PLATFORM.json"
if [ -f "$PACKER_PLATFORM" ]; then
platform_file="vars/$PACKER_PLATFORM.json"
fi
if [ -f "$PACKER_PLATFORM" ]; then
platform_file="vars/$PACKER_PLATFORM.json"
fi