X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fscripts%2Fdeploy.sh;h=abd2414742b2fef1d4ee96e3919696573355576b;hb=5db1c8f0c5590b4030dc33ee259927782dabae6b;hp=0589a8274ff57ac064a7d82995b90ccee4f2725c;hpb=459c348dc363fab68f05fdb874147be83b7fa8ec;p=infra%2Fcicd.git diff --git a/jjb/engine/scripts/deploy.sh b/jjb/engine/scripts/deploy.sh index 0589a827..abd24147 100755 --- a/jjb/engine/scripts/deploy.sh +++ b/jjb/engine/scripts/deploy.sh @@ -37,12 +37,6 @@ else ENGINE_ROOT_DIR="$WORKSPACE" fi -# TODO (fdegir): this is temporarily here to develop the jobs -if [[ "$GERRIT_PROJECT" != "infra/engine" ]]; then - cd $ENGINE_ROOT_DIR - git fetch "https://gerrit.nordix.org/infra/engine" refs/changes/23/4823/18 && git checkout FETCH_HEAD -fi - # NOTE (fdegir): for bifrost based deployments, we don't need these files so we fake them OPENRC_FILE=${OPENRC_FILE:-/tmp/openrc} HEAT_ENVIRONMENT_FILENAME=${HEAT_ENVIRONMENT_FILENAME:-/tmp/heat} @@ -50,6 +44,10 @@ HEAT_ENVIRONMENT_FILENAME=${HEAT_ENVIRONMENT_FILENAME:-/tmp/heat} /bin/cp -f $OPENRC_FILE /tmp/openrc cd "$ENGINE_ROOT_DIR/engine" -./deploy.sh -d -s "$STACK_TYPE" -v "$STACK_VERSION" -p "$PDF" -i "$IDF" -o /tmp/openrc +./deploy.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -c "$DEPLOY_SCENARIO" -p "$PDF" -i "$IDF" -o /tmp/openrc -d "$DISTRO" -v + +# NOTE (fdegir): we need inventory.ini for test execution +/bin/rm -f /tmp/inventory.ini +/bin/cp -f /opt/engine/.cache/config/inventory.ini /tmp/inventory.ini # vim: set ts=2 sw=2 expandtab: