summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRihab Banday <rihab.banday@ericsson.com>2021-06-29 13:48:04 +0200
committerRihab Banday <rihab.banday@ericsson.com>2021-06-30 15:14:52 +0000
commit2ed008cf29d094cfc15145bdac0aa4f996697cb7 (patch)
tree8f731625bc6c649104955276877467551fe01125
parente917625c424d33e892fa253cdd02da926b843325 (diff)
Pin current version of infra engine framework
This patch adds a specific commit id of the infra engine to avoid fetching latest changes from the master branch which may affect the deployments. Signed-off-by: Rihab Banday <rihab.banday@ericsson.com> Change-Id: I042f144f09db2cfa51f7a488a78426ebfabe65be Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72715 Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org> Reviewed-by: Michael Pedersen <michaelx.pedersen@intel.com> Reviewed-by: Georg Kunz <georg.kunz@ericsson.com>
-rw-r--r--deploy.env3
-rwxr-xr-xfunctions.sh6
2 files changed, 6 insertions, 3 deletions
diff --git a/deploy.env b/deploy.env
index 967bf90..9c40791 100644
--- a/deploy.env
+++ b/deploy.env
@@ -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