From e27d5c7f1e3235b376e94e8588e9873d045a6f2d Mon Sep 17 00:00:00 2001 From: toszo Date: Wed, 9 Jan 2019 11:28:36 +0100 Subject: [PATCH] Updated paths in scripts --- .gitignore | 20 ++++++------------- core/bin/gen_docs.sh | 2 +- .../roles/kafka/files/kafka_generate_ssl.sh | 2 +- .../src/scripts/azure/gen_templates_azure.sh | 2 +- core/core/src/scripts/azure/run_build.sh | 2 +- core/core/src/templates/azure/backend.sh.j2 | 2 +- core/core/src/templates/azure/del_rg.sh.j2 | 2 +- core/core/src/templates/azure/del_sp.sh.j2 | 2 +- core/core/src/templates/azure/gen_sp.sh.j2 | 2 +- core/core/src/templates/azure/login.sh.j2 | 2 +- core/core/src/templates/azure/release.sh.j2 | 2 +- core/core/src/templates/common/ansible.sh.j2 | 2 +- core/epiphany | 2 +- 13 files changed, 18 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index c3601cb7f5..e4bd5db9eb 100644 --- a/.gitignore +++ b/.gitignore @@ -49,25 +49,17 @@ epiphany.code-workspace # **/login.sh **/*.retry -# Data/ is the only place for data related files -# !build/**/*.tf -# !data/**/*.tf -# !data/**/*.yaml - -# Ignore data folder as this is a part of separate repository - data repository -data - # /data/*.yaml files will be in a private repo # These files will overlay the files in this repo as part of the build process so that the # private repo takes precedence over the public repo # Afterwards, remove all of the build folder except the ansible data from git -build/azure/infrastructure -build/aws -build/metal -build/vmware -build/vbox -build/* +core/build/azure/infrastructure +core/build/aws +core/build/metal +core/build/vmware +core/build/vbox +core/build/* examples/**/bin/ examples/**/obj/ diff --git a/core/bin/gen_docs.sh b/core/bin/gen_docs.sh index d3c4334216..17ddfd56c3 100644 --- a/core/bin/gen_docs.sh +++ b/core/bin/gen_docs.sh @@ -25,7 +25,7 @@ set -eu # Get the root of the Epiphany repo -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core mkdir -p $REPO_ROOT/docs/home mkdir -p $REPO_ROOT/docs/architecture diff --git a/core/core/src/ansible/roles/kafka/files/kafka_generate_ssl.sh b/core/core/src/ansible/roles/kafka/files/kafka_generate_ssl.sh index dc7b0446cc..cb688ceea9 100644 --- a/core/core/src/ansible/roles/kafka/files/kafka_generate_ssl.sh +++ b/core/core/src/ansible/roles/kafka/files/kafka_generate_ssl.sh @@ -16,7 +16,7 @@ # # Creates the REPO_ROOT env var for everything else to use... -# export REPO_ROOT=$(git rev-parse --show-toplevel) +# export REPO_ROOT=$(git rev-parse --show-toplevel)/core set -e diff --git a/core/core/src/scripts/azure/gen_templates_azure.sh b/core/core/src/scripts/azure/gen_templates_azure.sh index ee4178a262..2ffe31fe59 100644 --- a/core/core/src/scripts/azure/gen_templates_azure.sh +++ b/core/core/src/scripts/azure/gen_templates_azure.sh @@ -30,7 +30,7 @@ set -e TEMPLATES_BASE=core/src/templates/azure # Get the root of the Epiphany repo -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core COMMON_SCRIPTS_BASE=core/src/scripts/common COMMON_TEMPLATES_BASE=core/src/templates/common diff --git a/core/core/src/scripts/azure/run_build.sh b/core/core/src/scripts/azure/run_build.sh index e1cf4bf9a0..ac569ed4e7 100644 --- a/core/core/src/scripts/azure/run_build.sh +++ b/core/core/src/scripts/azure/run_build.sh @@ -38,7 +38,7 @@ # Exit immediately if something goes wrong. set -e -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core COMMON_SCRIPTS_BASE=core/src/scripts/common COMMON_TEMPLATES_BASE=core/src/templates/common diff --git a/core/core/src/templates/azure/backend.sh.j2 b/core/core/src/templates/azure/backend.sh.j2 index d8d71a6c86..2620ba62df 100644 --- a/core/core/src/templates/azure/backend.sh.j2 +++ b/core/core/src/templates/azure/backend.sh.j2 @@ -26,7 +26,7 @@ set -e {% if core.azure.terraform.backend.enable %} -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core # Parameter 4 (data file) is optional diff --git a/core/core/src/templates/azure/del_rg.sh.j2 b/core/core/src/templates/azure/del_rg.sh.j2 index 2cf99c2dcb..a2e76008bb 100644 --- a/core/core/src/templates/azure/del_rg.sh.j2 +++ b/core/core/src/templates/azure/del_rg.sh.j2 @@ -27,7 +27,7 @@ # Exit immediately if something goes wrong. set -e -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core COMMON_SCRIPTS_BASE=core/src/scripts/common diff --git a/core/core/src/templates/azure/del_sp.sh.j2 b/core/core/src/templates/azure/del_sp.sh.j2 index eb75330f77..3f425854fe 100644 --- a/core/core/src/templates/azure/del_sp.sh.j2 +++ b/core/core/src/templates/azure/del_sp.sh.j2 @@ -22,7 +22,7 @@ # Exit immediately if something goes wrong. set -e -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core COMMON_SCRIPTS_BASE=core/src/scripts/common diff --git a/core/core/src/templates/azure/gen_sp.sh.j2 b/core/core/src/templates/azure/gen_sp.sh.j2 index 30c15e5424..5ad037266c 100644 --- a/core/core/src/templates/azure/gen_sp.sh.j2 +++ b/core/core/src/templates/azure/gen_sp.sh.j2 @@ -25,7 +25,7 @@ # Exit immediately if something goes wrong. set -e -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core # Parameter 4 (data file) is optional diff --git a/core/core/src/templates/azure/login.sh.j2 b/core/core/src/templates/azure/login.sh.j2 index 72f27fa745..a380fb77da 100644 --- a/core/core/src/templates/azure/login.sh.j2 +++ b/core/core/src/templates/azure/login.sh.j2 @@ -25,7 +25,7 @@ # Exit immediately if something goes wrong. set -e -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core COMMON_SCRIPTS_BASE=core/src/scripts/common COMMON_TEMPLATES_BASE=core/src/templates/common diff --git a/core/core/src/templates/azure/release.sh.j2 b/core/core/src/templates/azure/release.sh.j2 index 608d412204..88d0b20e28 100644 --- a/core/core/src/templates/azure/release.sh.j2 +++ b/core/core/src/templates/azure/release.sh.j2 @@ -22,7 +22,7 @@ # Exit immediately if something goes wrong. set -e -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core COMMON_SCRIPTS_BASE=core/src/scripts/common COMMON_TEMPLATES_BASE=core/src/templates/common diff --git a/core/core/src/templates/common/ansible.sh.j2 b/core/core/src/templates/common/ansible.sh.j2 index 8c282f3ad4..2bfdb1e2b9 100644 --- a/core/core/src/templates/common/ansible.sh.j2 +++ b/core/core/src/templates/common/ansible.sh.j2 @@ -29,7 +29,7 @@ # Exit immediately if something goes wrong. set -e -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core # Stops the 'cow' ascii art from showing! export ANSIBLE_NOCOWS=1 diff --git a/core/epiphany b/core/epiphany index 2e73ddb380..2f894f2f17 100644 --- a/core/epiphany +++ b/core/epiphany @@ -15,7 +15,7 @@ # limitations under the License. # Creates the REPO_ROOT env var for everything else to use... -export REPO_ROOT=$(git rev-parse --show-toplevel) +export REPO_ROOT=$(git rev-parse --show-toplevel)/core # Exit immediately if anything goes wrong, instead of making things worse. set -eu