From 8d7128a62cd2f9b3df1d59bf4aa4fa7a387b1679 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 29 Jul 2017 22:49:26 +0200 Subject: salt.sh: Drop upstream clone in favor of local git salt.sh currently clones the full Fuel@OPNFV git repo from upstream public mirror, preventing us from testing locally edited or new patches. Instead, bring back git submodule handling from old f_repos, clone and patch each submodule locally, then copy the whole parent repo over to cfg01. This is also a first step towards implementing offline deploy support. NOTE: This adds new deploy prerequisite packages: - git (for submodule clone/update); - make (for submodule patching); - rsync (for parent repo replication to cfg01); NOTE: Parent repository is expected to be a git repo, in order to work with git submodules. While at it, perform some minor related changes: - add deploy artifacts (ISOs, qcow2 files) to .gitignore, also used to filter-out such files during rsync to cfg01; - remove obsolete Fuel patches (old f_repos mechanism); - rename "reclass-system-salt-model" submodule; Change-Id: I6210d80d41010b2802e4f1b31acf249a18db7963 Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ci/deploy.sh') diff --git a/ci/deploy.sh b/ci/deploy.sh index d081c0332..3ac7ff1ea 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -269,8 +269,10 @@ pushd "${DEPLOY_DIR}" > /dev/null # scenario, etc. # Install required packages -[ -n "$(command -v apt-get)" ] && apt-get install -y mkisofs curl virtinst cpu-checker qemu-kvm -[ -n "$(command -v yum)" ] && yum install -y genisoimage curl virt-install qemu-kvm +[ -n "$(command -v apt-get)" ] && apt-get install -y \ + git make rsync mkisofs curl virtinst cpu-checker qemu-kvm +[ -n "$(command -v yum)" ] && yum install -y \ + git make rsync genisoimage curl virt-install qemu-kvm # Check scenario file existence if [[ ! -f ../config/${DEPLOY_SCENARIO}.yaml ]]; then -- cgit 1.2.3-korg