From 8bacaf67000180245721363de6f699c32ee5da35 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Sat, 13 Jan 2018 12:03:40 -0500 Subject: [PATCH] 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 --- .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder | 2 +- .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet | 2 +- .../expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder | 2 +- .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet | 2 +- .jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder | 2 +- .jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet | 2 +- .../expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder | 2 +- .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet | 2 +- shell/packer-build.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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 e8d7d0db..3569d83e 100644 --- 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 bfb817bc..a759c4b1 100644 --- 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 26e90b0b..ebcd8ae4 100644 --- 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 b6dcfe13..052561cb 100644 --- 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 86f2f16f..29ded269 100644 --- 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 9ec70a29..a6da5f95 100644 --- 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 ac8211d2..12f74aab 100644 --- 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 b50f1f17..8bf29131 100644 --- 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 177bb1cb..d3e306f3 100644 --- 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 -- 2.16.6