Updated paths in scripts

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

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

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
 

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

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

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
 

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
 

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
 

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
 

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

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

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

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