Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request hitachienergy#2 from epiphany-platform/fix/scripts…
Browse files Browse the repository at this point in the history
…-path-update

Updated paths in scripts
toszo authored Jan 9, 2019
2 parents 9575db8 + a9403e4 commit b5f28bf
Showing 13 changed files with 18 additions and 26 deletions.
20 changes: 6 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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/
2 changes: 1 addition & 1 deletion core/bin/gen_docs.sh
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion core/core/src/scripts/azure/gen_templates_azure.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion core/core/src/scripts/azure/run_build.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion core/core/src/templates/azure/backend.sh.j2
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion core/core/src/templates/azure/del_rg.sh.j2
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion core/core/src/templates/azure/del_sp.sh.j2
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion core/core/src/templates/azure/gen_sp.sh.j2
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion core/core/src/templates/azure/login.sh.j2
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion core/core/src/templates/azure/release.sh.j2
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion core/core/src/templates/common/ansible.sh.j2
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion core/epiphany
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b5f28bf

Please sign in to comment.