use ssh_url for private github repos

Author: ib-steffen

src/github/trigger/trigger.py

@@ -223,7 +223,12 @@ def create_push(self, c, repository, branch, tag):
                   status_url])
 
         build_id = self.create_build(commit_id, project_id)
-        self.create_job(c['id'], repository['clone_url'], build_id,
+        clone_url = repository['clone_url']
+
+        if repository['private']:
+            clone_url = repository['ssh_url']
+
+        self.create_job(c['id'], clone_url, build_id,
                         project_id, branch)
 
     def handle_push(self, event):
@@ -393,8 +398,14 @@ def handle_pull_request(self, event):
             return res(200, 'build already triggered')
 
         build_id = self.create_build(commit_id, project_id)
+
+        clone_url = event['repository']['clone_url']
+
+        if event['repository']['private']:
+            clone_url = event['repository']['ssh_url']
+
         self.create_job(event['pull_request']['head']['sha'],
-                        event['pull_request']['head']['repo']['clone_url'],
+                        clone_url,
                         build_id, project_id, branch, env=env, fork=is_fork)
 
         self.conn.commit()

src/job/entrypoint.sh

@@ -34,7 +34,7 @@ fi
 if [ ! -z "$INFRABOX_GIT_PRIVATE_KEY" ]; then
     echo "Setting private key"
     eval `ssh-agent -s`
-    echo $INFRABOX_GIT_PRIVATE_KEY > ~/.ssh/id_rsa
+    echo "$INFRABOX_GIT_PRIVATE_KEY" > ~/.ssh/id_rsa
     chmod 600 ~/.ssh/id_rsa
     echo "StrictHostKeyChecking no" > ~/.ssh/config
     ssh-add ~/.ssh/id_rsa