Changes in CI

autodeploy-jira/jira-client.py

@@ -26,4 +26,4 @@ def getProjectKeys(self):
 
 if __name__=="__main__":
     c=jiraClient("http://shgp.kfshrc.edu.sa/jira",'mkalioby','wanted85')
-    print c.getProjectKeys()
+    print(c.getProjectKeys())

client/autodeploy_client/Client.py

@@ -1,6 +1,6 @@
-import Config
-import ClientJob as Job
-import Connect
+from . import Config
+from . import ClientJob as Job
+from . import Connect
 import simplejson
 import xml.dom.minidom
 from operator import itemgetter
@@ -82,6 +82,14 @@ def Deploy(self, workdir, configFile, owner=''):
         result = self._send(msg)
         return result
 
+    def Integrate(self, workdir, configFile, owner=''):
+        global msg
+        if owner == '':
+            owner = Config.Owner
+        msg = Job.createIntegrateMessage(workdir=workdir, configFile=configFile, scm=self.scm, owner=owner)
+        result = self._send(msg)
+        return result
+
     def CheckUp(self):
         return Connect.connect(self.server, self.port, 5)
 
@@ -95,18 +103,11 @@ def ListCommits(self, workdir, page=0, rpp=10, owner='',options=None):
         for line in res.split("\n"):
             if line=="": continue
             info = line.split(",,")
-            # print line
-         #   if HEAD:
-          #      info[0] = "HEAD"
-           #     HEAD = False
             try:
-
                 d = {"Hash": info[0], "Short": info[1], "Author": info[2], "Committed": info[3], "Message": info[4]}
                 result.append(d)
-
             except:
-                print "Error while parsing line (%s)"%line
-        #print result
+                print("Error while parsing line (%s)"%line)
         return result
 
     def SwitchCommit(self, workdir, commit, owner=''):

client/autodeploy_client/ClientJob.py

@@ -12,15 +12,20 @@ def importKey():
         #print "KEY Opened" , key
         return key
 
+def sign(owner,scm,msg):
+    b = (owner + scm + msg).encode('utf-8')
+    key = (importKey().encrypt(b, "")[0])
+    return base64.encodebytes(key).decode("utf8")
+
 
 def createGetBranchs(workdir, scm, owner,options=None):
-    sec = base64.encodestring(importKey().encrypt(owner + scm + "LIST-BRNACHS", "")[0])
+    sec= sign(owner,scm,"LIST-BRNACHS")
     f = '<job  owner="%s" type="%s" sec="%s" scm="%s">\n' % (owner, "LIST-BRNACHS", sec, scm)
     f += '<workdir>%s</workdir>' % workdir
 
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
@@ -31,14 +36,14 @@ def createGetBranchs(workdir, scm, owner,options=None):
 # Provide id, owner and command as string
 # inputsFiles as List of file path
 def createCloneMessage(owner, repo, workdir, key, scm, options=None):
-    sec=base64.encodestring(importKey().encrypt(owner+scm+"CLONE","")[0])
+    sec = sign(owner, scm, "CLONE")
     f = '<job  owner="%s" type="%s" sec="%s" scm="%s">\n'%( owner,"CLONE",sec,scm)
     f += '<workdir>%s</workdir>'%workdir
     f += '<repo>%s</repo>'%repo
     f += '<sshkey>%s</sshkey>'%key
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
@@ -49,77 +54,95 @@ def createCloneMessage(owner, repo, workdir, key, scm, options=None):
 
 
 def createPullMessage(owner,workdir,key, scm, options=None):
-    sec=base64.encodestring(importKey().encrypt(owner+scm+"PULL","")[0])
+    sec = sign(owner, scm, "PULL")
     f = '<job  owner="%s" type="%s" sec="%s" scm="%s">\n'%( owner,"PULL",sec,scm)
     f += '<workdir>%s</workdir>'%workdir
     #f += '<repo>%s</repo>'%repo
     f += '<sshkey>%s</sshkey>'%key
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
     f += '</job>'
     return f
 
 def createListTagsMessage(owner, workdir,key, scm, options=None):
-    sec=base64.encodestring(importKey().encrypt(owner+scm+"LIST-TAGS","")[0])
+    sec = sign(owner, scm, "LIST-TAGS")
     f = '<job  owner="%s" type="%s" sec="%s" scm="%s">\n'%( owner,"LIST-TAGS",sec,scm)
     f += '<workdir>%s</workdir>'%workdir
     f += '<sshkey>%s</sshkey>'%key
 
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
     f += '</job>'
     return f
 
 def createSwitchTagMessage(owner, workdir, scm, tag, options=None):
-    sec=base64.encodestring(importKey().encrypt(owner+scm+"SWITCH-TAG","")[0])
+    sec = sign(owner, scm, "SWITCH-TAG")
     f = '<job owner="%s" type="%s" sec="%s" scm="%s">\n'%( owner,"SWITCH-TAG",sec,scm)
     f += '<workdir>%s</workdir>'%workdir
     f += '<tag>%s</tag>'%tag
 
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
     f += '</job>'
     return f
 
 def createDeployMessage(owner, workdir, scm, configFile, options=None):
-    sec=base64.encodestring(importKey().encrypt(owner+scm+"DEPLOY","")[0])
+    sec = sign(owner, scm, "DEPLOY")
     f = '<job owner="%s" type="%s" sec="%s" scm="%s">\n'%( owner,"DEPLOY",sec,scm)
     f += '<workdir>%s</workdir>'%workdir
     f += '<configFile>%s</configFile>'%configFile
-    print configFile
+    print(configFile)
+    conf=open(str(configFile)).read()
+    f += '<file>%s</file>'%(base64.encodestring(conf))
+
+    if options:
+        f += '<options>'
+        for option in list(options.keys()):
+            f += "<option name='%s'>%s</option>" % (option, options[option])
+
+        f += "</options>"
+    f += '</job>'
+    return f
+
+def createIntegrateMessage(owner, workdir, scm, configFile, options=None):
+    sec = sign(owner, scm, "INTEGRATE")
+    f = '<job owner="%s" type="%s" sec="%s" scm="%s">\n'%(owner,"INTEGRATE",sec,scm)
+    f += '<workdir>%s</workdir>'%workdir
+    f += '<configFile>%s</configFile>'%configFile
+    print(configFile)
     conf=open(str(configFile)).read()
     f += '<file>%s</file>'%(base64.encodestring(conf))
 
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
     f += '</job>'
     return f
 
 def createListCommitsMessage(owner, workdir, key, scm, options=None):
-    sec=base64.encodestring(importKey().encrypt(owner+scm+"LIST-COMMITS","")[0])
+    sec = sign(owner, scm, "LIST-COMMITS")
     f = '<job  owner="%s" type="%s" sec="%s" scm="%s">\n'%( owner,"LIST-COMMITS",sec,scm)
     f += '<workdir>%s</workdir>'%workdir
     f += '<sshkey>%s</sshkey>'%key
 
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
@@ -128,44 +151,44 @@ def createListCommitsMessage(owner, workdir, key, scm, options=None):
 
 
 def createSwitchCommitMessage(owner, workdir, commit,scm, options=None):
-    sec=base64.encodestring(importKey().encrypt(owner+scm+"SWITCH-COMMIT","")[0])
+    sec = sign(owner, scm, "SWITCH-COMMIT")
     f = '<job owner="%s" type="%s" sec="%s" scm="%s">\n'%( owner,"SWITCH-COMMIT",sec,scm)
     f += '<workdir>%s</workdir>'%workdir
     f += '<commit>%s</commit>'%commit
 
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
     f += '</job>'
     return f
 
 def creategetCommitsDiffMessage(owner, workdir, commit, scm,options=None):
-    print owner,workdir,commit,scm
-    sec=base64.encodestring(importKey().encrypt(owner+str(scm)+"DIFF-COMMIT","")[0])
+    print(owner,workdir,commit,scm)
+    sec = sign(owner, scm, "DIFF-COMMIT")
     #sec=base64.encodestring(importKey().encrypt(owner+scm+"DIFF-COMMIT","")[0])
     f = '<job owner="%s" type="%s" sec="%s" scm="%s">\n'%( owner,"DIFF-COMMIT",sec,scm)
     f += '<workdir>%s</workdir>'%workdir
     f += '<commit>%s</commit>'%commit
 
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"
     f += '</job>'
     return f
 
 def createGetChangeLog(owner,workdir,scm,options=None):
-    sec = base64.encodestring(importKey().encrypt(owner + scm + "LIST-CHANGES", "")[0])
+    sec = sign(owner, scm, "LIST-CHANGES")
     f = '<job  owner="%s" type="%s" sec="%s" scm="%s">\n' % (owner, "LIST-CHANGES", sec, scm)
     f += '<workdir>%s</workdir>' % workdir
     if options:
         f += '<options>'
-        for option in options.keys():
+        for option in list(options.keys()):
             f += "<option name='%s'>%s</option>" % (option, options[option])
 
         f += "</options>"

client/autodeploy_client/Common.py

@@ -1,2 +1 @@
 EOM="\n\n###"
-

client/autodeploy_client/Config.py

@@ -1,4 +1,4 @@
-import ConfigParser
+import configparser
 import os
 
 

client/autodeploy_client/Connect.py

@@ -1,19 +1,21 @@
-import socket, base64, time, sys, subprocess
-import Config
-
+import socket, time
 EOM = "\n\n###"
 
 
 def Send(message,server,port):
     if waitTillAlive(server, port):
         client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         client.connect((server, port))
-        client.send(message + EOM)
+        output = str(message) + str(EOM)
+        client.sendall(output.encode('utf-8'))
         chunks = []
         while True:
-            buf = client.recv(10000)
+            buf = (client.recv(10000)).decode("utf-8")
             if len(buf) < 5:
-                chunks[-1] += buf
+                if len(chunks) == 0:
+                    chunks.append(buf)
+                else:
+                    chunks[-1] += buf
             else:
                 chunks.append(str(buf))
             if EOM in chunks[-1]:
@@ -27,7 +29,8 @@ def connect(domain,port,timeout=10):
         client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         client.settimeout(timeout)
         client.connect((domain, port))
-        client.send("TEST: HELLO\n\n###")
+        output = 'TEST: HELLO\n\n###'
+        client.sendall(output.encode('utf-8'))
         client.close()
         return True
     except IOError:
@@ -38,11 +41,10 @@ def waitTillAlive(domain, port):
     secondTime = False
     while (1):
             if connect(domain,port):
-                if secondTime: print "Connected To:",domain
+                if secondTime: print("Connected To:",domain)
                 break
             else:
                 time.sleep(5)
                 secondTime = True
-                print "Trying again...."
+                print("Trying again....")
     return True
-

client/autodeploy_client/__init__.py

@@ -1,3 +1,3 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3.7
 
-from Client import *
+from .Client import *

requirments.txt

@@ -1,8 +1,8 @@
-pycrypto
-django==1.8
-jsonfield==2.0.2
-django-tables2==1.0.4
-django-tables2-reports==0.1.3
+pycryptodome
+django==2.2
+jsonfield
+django-tables2
+django-tables2-reports
 jira
 django-mfa2
 pyyaml

server/Common.py

@@ -18,7 +18,7 @@ def run(executer, id=None):
         f.flush()
         f.close()
 
-    if len(stderr) > 0 and "fatal" in stderr:
-        return "ERR:"+stderr
+    if len(stderr) > 0 and b"fatal" in stderr:
+        return b"ERR:"+stderr
     if stdout=="": return "Done"
     return stdout

server/Config.cfg

@@ -1,6 +1,6 @@
 [Server]
 port: 4567
-publicKey: /home/shgpuser/dev/AutoDeploy/server/client.pub
+publicKey: /home/mahmood/Work/autodeploy/home/AutoDeploy/server/client.pub
 
 [MISC]
 log_limit: 30