airship
/
airship-in-a-bottle
Code Issues Proposed changes

Use correct shipyard directories 

Change-Id: I54057dde3d6ddf31026afa53b1a52420f67b9f09
This commit is contained in:
Marcus Furlong 2019-07-12 11:04:24 -04:00 committed by Roman Gorshunov
parent 0d84bdd821
commit 7cb88d92e0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/common/deploy-airship.sh
View File

@ -164,11 +164,11 @@ function get_repo() {
# $3 = refspec of repo pull # $3 = refspec of repo pull
cd ${WORKSPACE} cd ${WORKSPACE}
if [ ! -d "$1" ] ; then if [ ! -d "$1" ] ; then
git clone $2 git clone $2 $1
if [ -n "$3" ] ; then if [ -n "$3" ] ; then
cd $1 pushd $1
git pull $2 $3 git pull $2 $3
cd .. popd
fi fi
fi fi
} }
@ -176,11 +176,11 @@ function get_repo() {
function setup_repos() { function setup_repos() {
# Clone and pull the various git repos # Clone and pull the various git repos
# Get pegleg for the script only. Image is separately referenced. # Get pegleg for the script only. Image is separately referenced.
get_repo airship-pegleg ${PEGLEG_REPO} ${PEGLEG_REFSPEC} get_repo pegleg ${PEGLEG_REPO} ${PEGLEG_REFSPEC}
# Get airship-in-a-bottle for the design # Get airship-in-a-bottle for the design
get_repo airship-in-a-bottle ${AIRSHIP_IN_A_BOTTLE_REPO} ${AIRSHIP_IN_A_BOTTLE_REFSPEC} get_repo airship-in-a-bottle ${AIRSHIP_IN_A_BOTTLE_REPO} ${AIRSHIP_IN_A_BOTTLE_REFSPEC}
# Get Shipyard for use after genesis # Get Shipyard for use after genesis
get_repo airship-shipyard ${SHIPYARD_REPO} ${SHIPYARD_REFSPEC} get_repo shipyard ${SHIPYARD_REPO} ${SHIPYARD_REFSPEC}
} }
function configure_dev_configurables() { function configure_dev_configurables() {
@ -302,9 +302,9 @@ function setup_deploy_site() {
mkdir -p ${WORKSPACE}/site mkdir -p ${WORKSPACE}/site
cp ${WORKSPACE}/airship-in-a-bottle/manifests/common/creds.sh ${WORKSPACE}/site cp ${WORKSPACE}/airship-in-a-bottle/manifests/common/creds.sh ${WORKSPACE}/site
cp ${WORKSPACE}/genesis/*.yaml ${WORKSPACE}/site cp ${WORKSPACE}/genesis/*.yaml ${WORKSPACE}/site
cp ${WORKSPACE}/airship-shipyard/tools/run_shipyard.sh ${WORKSPACE}/site cp ${WORKSPACE}/shipyard/tools/run_shipyard.sh ${WORKSPACE}/site
cp ${WORKSPACE}/airship-shipyard/tools/shipyard_docker_base_command.sh ${WORKSPACE}/site cp ${WORKSPACE}/shipyard/tools/shipyard_docker_base_command.sh ${WORKSPACE}/site
cp ${WORKSPACE}/airship-shipyard/tools/execute_shipyard_action.sh ${WORKSPACE}/site cp ${WORKSPACE}/shipyard/tools/execute_shipyard_action.sh ${WORKSPACE}/site
print_shipyard_info2 print_shipyard_info2
} }
function print_shipyard_info2() { function print_shipyard_info2() {