Browse code

Merge "Actually install the requirements repo."

Jenkins authored on 2015/06/18 12:21:12
Showing 1 changed files
... ...
@@ -29,9 +29,6 @@ REQUIREMENTS_DIR=$DEST/requirements
29 29
 
30 30
 # install_infra() - Collect source and prepare
31 31
 function install_infra {
32
-    # bring down global requirements
33
-    git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
34
-
35 32
     # Install pbr
36 33
     if use_library_from_git "pbr"; then
37 34
         git_clone_by_name "pbr"
... ...
@@ -41,6 +38,10 @@ function install_infra {
41 41
         # in via system packages.
42 42
         pip_install "-U" "pbr"
43 43
     fi
44
+
45
+    # bring down global requirements
46
+    git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
47
+    pip_install $REQUIREMENTS_DIR
44 48
 }
45 49
 
46 50
 # Restore xtrace