diff options
| -rw-r--r-- | deploy.env | 3 | ||||
| -rwxr-xr-x | functions.sh | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -11,6 +11,9 @@ export DEPLOYMENT=${DEPLOYMENT:-full} # Name of host bridge to which the VM is connected to (used for PXE) export BRIDGE=pxebr +# Specific infra engine SHA to avoid fetching latest master changes +export ENGINE_COMMIT_ID=${ENGINE_COMMIT_ID:-08325937} + # Jump VM details export VM_NAME=$(yq r $CURRENTPATH/hw_config/$VENDOR/pdf.yaml jumphost.name) export USERNAME=${USERNAME:-ubuntu} diff --git a/functions.sh b/functions.sh index 96a0fd7..c8968a3 100755 --- a/functions.sh +++ b/functions.sh @@ -179,11 +179,11 @@ provision_hosts() { if [ ! -d "${PROJECT_ROOT}/engine" ]; then ssh-keygen -t rsa -N "" -f ${PROJECT_ROOT}/.ssh/id_rsa git clone https://gerrit.nordix.org/infra/engine.git - cp $PROJECT_ROOT/$VENDOR/{pdf.yaml,idf.yaml} \ + cd ${PROJECT_ROOT}/engine/engine && git checkout ${ENGINE_COMMIT_ID} + cp ${PROJECT_ROOT}/${VENDOR}/{pdf.yaml,idf.yaml} \ ${PROJECT_ROOT}/engine/engine fi -cd ${PROJECT_ROOT}/engine/engine -./deploy.sh -s ironic -d ${DISTRO} \ +${PROJECT_ROOT}/engine/engine/deploy.sh -s ironic -d ${DISTRO} \ -p file:///${PROJECT_ROOT}/engine/engine/pdf.yaml \ -i file:///${PROJECT_ROOT}/engine/engine/idf.yaml EOF |