Browse code

Merge "Fix troubles with git cloning https"

Jenkins authored on 2012/02/18 08:21:30
Showing 2 changed files
... ...
@@ -31,7 +31,7 @@ if ! which git; then
31 31
     wget http://git-core.googlecode.com/files/git-1.7.7.tar.gz
32 32
     tar xfv git-1.7.7.tar.gz
33 33
     cd $GITDIR
34
-    ./configure
34
+    ./configure --with-curl --with-expat
35 35
     make install
36 36
     cd $TOP_DIR
37 37
 fi
... ...
@@ -141,7 +141,7 @@ fi
141 141
 
142 142
 # Checkout nova
143 143
 if [ ! -d $TOP_DIR/nova ]; then
144
-    git clone $NOVA_REPO
144
+    env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO
145 145
     cd $TOP_DIR/nova
146 146
     git checkout $NOVA_BRANCH
147 147
 fi 
... ...
@@ -1,9 +1,9 @@
1
-#!/bin/sh
1
+#i!/bin/sh
2 2
 set -o xtrace
3 3
 set -o errexit
4 4
 
5 5
 # Install basics for vi and git
6
-yum -y  --enablerepo=base install gcc make vim-enhanced zlib-devel openssl-devel
6
+yum -y  --enablerepo=base install gcc make vim-enhanced zlib-devel openssl-devel curl-devel.i386
7 7
 
8 8
 # Simple but usable vimrc
9 9
 if [ ! -e /root/.vimrc ]; then
... ...
@@ -30,7 +30,7 @@ if ! which git; then
30 30
     wget http://git-core.googlecode.com/files/git-1.7.7.tar.gz
31 31
     tar xfv git-1.7.7.tar.gz
32 32
     cd $GITDIR
33
-    ./configure
33
+    ./configure --with-curl --with-expat
34 34
     make install
35 35
 fi
36 36