X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fscripts%2Fpackage.sh;h=642d5b9940d7e72a950f59d14dccd162d03b3a5f;hb=24eaec5b71aa5f80e147731d7204c86f0dbd4a2b;hp=38f2955b82addaa692844dec144319639568da9d;hpb=bd007e1ae6dc49eb1c0e47442fe8a9226fd1a5a9;p=infra%2Fcicd.git

diff --git a/jjb/engine/scripts/package.sh b/jjb/engine/scripts/package.sh
index 38f2955b..642d5b99 100755
--- a/jjb/engine/scripts/package.sh
+++ b/jjb/engine/scripts/package.sh
@@ -18,14 +18,29 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 
-set -o nounset
 set -o errexit
 set -o pipefail
 
-source "$WORKSPACE/change.properties"
+# NOTE (fdegir): we need to remove $WORKSPACE and clone infra/engine repository
+# as infra/engine is what drives the deployment
+if [[ "$GERRIT_PROJECT" != "infra/engine" ]]; then
+  cd "$HOME" && /bin/rm -rf "$WORKSPACE"
+  echo "Info : Cloning infra/engine repository"
+  git clone -q https://gerrit.nordix.org/infra/engine.git "$WORKSPACE"
+  cd "$WORKSPACE"
+fi
+
+# NOTE (fdegir): this variable is set by generate-change-metadata.sh script
+# if a dependency to engine repo is determined so we check out that refspec
+# to ensure we respect the dependency
+if [[ ! -z "${NORDIX_ENGINE_REFSPEC+x}" ]]; then
+  echo "Info  : Fetching dependent change ${NORDIX_ENGINE_REFSPEC} infra/engine"
+  git fetch "https://gerrit.nordix.org/infra/engine" ${NORDIX_ENGINE_REFSPEC} && git checkout FETCH_HEAD
+fi
+
 echo "Info  : Packaging stack $STACK_TYPE"
 
 cd "$WORKSPACE/engine"
-./package.sh -s "$STACK_TYPE" -v "$STACK_VERSION" -d
+./package.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -d "$DISTRO" -v
 
 # vim: set ts=2 sw=2 expandtab: