[jump req] Add build/deploy specific requirements

Add support for different prerequisites depending on the current
operation (docker build or cluster deploy).

Leverage the new support to pre-install upcoming deps:
- python-pip (build);
- docker-compose (deploy);

JIRA: FUEL-383

Change-Id: Ic3e6062b1943e3584f0b1f80d2e33b8812defced
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index ea8524a..d3704a1 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -240,7 +240,7 @@ if [ ${USE_EXISTING_PKGS} -eq 1 ]; then
     notify "[NOTE] Skipping distro pkg installation" 2
 else
     notify "[NOTE] Installing required distro pkgs" 2
-    jumpserver_pkg_install
+    jumpserver_pkg_install 'deploy'
 fi
 
 if ! virsh list >/dev/null 2>&1; then

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index c566cc9..c3a71a4 100644 (file)
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -321,6 +321,7 @@ function prepare_vms {
 }
 
 function jumpserver_pkg_install {
+  local req_type=$1
   if [ -n "$(command -v apt-get)" ]; then
     pkg_type='deb'; pkg_cmd='sudo apt-get install -y'
   else
@@ -328,7 +329,7 @@ function jumpserver_pkg_install {
   fi
   eval "$(parse_yaml "./requirements_${pkg_type}.yaml")"
   for section in 'common' "$(uname -i)"; do
-    section_var="requirements_pkg_${section}[*]"
+    section_var="${req_type}_${section}[*]"
     pkg_list+=" ${!section_var}"
   done
   # shellcheck disable=SC2086

diff --git a/mcp/scripts/requirements_deb.yaml b/mcp/scripts/requirements_deb.yaml
index 04ddcf6..c04f2a1 100644 (file)
--- a/mcp/scripts/requirements_deb.yaml
+++ b/mcp/scripts/requirements_deb.yaml
@@ -6,13 +6,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-requirements_pkg:
+build:
+  # Common pkgs required for all builds, no matter the type, arch etc.
+  common:
+    - python-pip
+deploy:
   # Common pkgs required for all deploys, no matter the type, arch etc.
   common:
     - bridge-utils
     - cloud-guest-utils
     - cpu-checker
     - curl
+    - docker-compose
     - e2fsprogs
     - git
     - kpartx

diff --git a/mcp/scripts/requirements_rpm.yaml b/mcp/scripts/requirements_rpm.yaml
index 3df4d0a..50ce5d9 100644 (file)
--- a/mcp/scripts/requirements_rpm.yaml
+++ b/mcp/scripts/requirements_rpm.yaml
@@ -6,13 +6,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-requirements_pkg:
+build:
+  # Common pkgs required for all builds, no matter the type, arch etc.
+  common:
+    - python-pip
+deploy:
   # Common pkgs required for all deploys, no matter the type, arch etc.
   common:
     - bc
     - bridge-utils
     - cloud-utils-growpart
     - curl
+    - docker-compose
     - elfutils-libelf-devel
     - e2fsprogs
     - genisoimage