Fix default platform location to common-packer

The default search path should be common-packer and only loading
the local project's version if it exists.

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

diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
index e8d7d0d..3569d83 100644 (file)
--- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-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
-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

diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
index bfb817b..a759c4b 100644 (file)
--- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
@@ -387,7 +387,7 @@ mkdir -p "$PACKER_LOGS_DIR"
 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

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
-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

diff --git a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
index b6dcfe1..052561c 100644 (file)
--- a/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
@@ -387,7 +387,7 @@ mkdir -p "$PACKER_LOGS_DIR"
 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

diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
index 86f2f16..29ded26 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
@@ -345,7 +345,7 @@ mkdir -p "$PACKER_LOGS_DIR"
 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

diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
index 9ec70a2..a6da5f9 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
@@ -345,7 +345,7 @@ mkdir -p "$PACKER_LOGS_DIR"
 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

diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
index ac8211d..12f74aa 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
@@ -345,7 +345,7 @@ mkdir -p "$PACKER_LOGS_DIR"
 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

diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
index b50f1f1..8bf2913 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
@@ -345,7 +345,7 @@ mkdir -p "$PACKER_LOGS_DIR"
 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

diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index 177bb1c..d3e306f 100644 (file)
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -23,7 +23,7 @@ mkdir -p "$PACKER_LOGS_DIR"
 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