From 38ca126cdc466d4fe903b92e2e79cd0fd15c0d78 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 29 Dec 2015 17:03:57 +0100 Subject: [PATCH 1/6] fixed a minor bug for python execution --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88c25a1ca6..fe6fc9dbc6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ job1: - echo $EXTERNAL_SHARE_RESULTS_DIR - mkdir -p $NFS_TEST_RESULTS_DIR - mkdir -p $EXTERNAL_SHARE_RESULTS_DIR - - $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r $OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log + - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r $OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log - mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$EXTERNAL_SHARE_DIR From 3c455f7d38ebd7ed342f6467c985c1edc4361ed7 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 29 Dec 2015 18:33:50 +0100 Subject: [PATCH 2/6] minor bugfix for paramiko logfile --- cmake_targets/autotests/run_exec_lte-softmodem_tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py index c7449bcac3..132fefe0c2 100644 --- a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py +++ b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py @@ -1016,9 +1016,7 @@ except KeyError: print "Please set the environment variable OPENAIR_TARGETS in the .bashrc" sys.exit(1) -paramiko_logfile = os.path.expandvars('$OPENAIR_DIR/cmake_targets/autotests/log/paramiko.log') -res=os.system(' echo > ' + paramiko_logfile) -paramiko.util.log_to_file(paramiko_logfile) + # get the oai object host = os.uname()[1] @@ -1045,6 +1043,10 @@ if flag_remove_logdir == True: print "Removing directory: " + locallogdir os.system(' rm -fr ' + locallogdir + '; mkdir -p ' + locallogdir ) +paramiko_logfile = os.path.expandvars('$OPENAIR_DIR/cmake_targets/autotests/log/paramiko.log') +res=os.system(' echo > ' + paramiko_logfile) +paramiko.util.log_to_file(paramiko_logfile) + #pw=getpass.getpass() #Now we parse the xml file for basic configuration From a3ab1a90f52620654b95fa58ace213545bae4530 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 29 Dec 2015 19:01:52 +0100 Subject: [PATCH 3/6] minor bugfixes due to runtime errors --- cmake_targets/autotests/run_exec_lte-softmodem_tests.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py index 132fefe0c2..67b6daed66 100644 --- a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py +++ b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py @@ -1026,7 +1026,7 @@ oai_list = [] #start_time = time.time() # datetime.datetime.now() if user=='': user = getpass.getuser() -if password=='': +if pw=='': pw = getpass.getpass() print "host = " + host print "user = " + user @@ -1094,7 +1094,7 @@ if GitOAI5GHeadVersion == '': NFSTestsResultsDir = NFSResultsShare + '/'+ GitOAI5GRepoBranch + '/' + GitOAI5GHeadVersion + '/' -print "NFSResultsShareDir = " + NFSResultsShareDir +print "NFSTestsResultsDir = " + NFSTestsResultsDir MachineList = MachineList.split() MachineListGeneric = MachineListGeneric.split() @@ -1195,7 +1195,7 @@ print "cpu freq(MHz): " + str(cpu_freq) + "timeout(s): " + str(timeout) #print result #We now prepare the machines for testing -#index=0 +index=0 threads_init_setup=[] for oai in oai_list: try: @@ -1205,7 +1205,7 @@ for oai in oai_list: #print oai_list[oai].send_recv('who am i') #cleanUpPrograms(oai_list[oai] cmd = 'sudo -S -E rm -fr ' + logdir + ' ; mkdir -p ' + logdir - result = oai[index].send_recv(cmd) + result = oai.send_recv(cmd) setuplogfile = logdir + '/setup_log_' + MachineList[index] + '_.txt' setup_script = locallogdir + '/setup_script_' + MachineList[index] + '_.txt' @@ -1269,6 +1269,7 @@ for oai in oai_list: #print '\nCleaning Older running programs : ' + CleanUpOldProgs #cleanOldPrograms(oai_list[index], CleanUpOldProgs) + index = index + 1 except Exception, e: print 'There is error in one of the commands to setup the machine '+ MachineList[index] error='' From dc020be2c4324281aede3907a8802a74fb8a6fce Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 29 Dec 2015 19:16:40 +0100 Subject: [PATCH 4/6] added argument for passing GIT HEAD commit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe6fc9dbc6..092993340a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ job1: - echo $EXTERNAL_SHARE_RESULTS_DIR - mkdir -p $NFS_TEST_RESULTS_DIR - mkdir -p $EXTERNAL_SHARE_RESULTS_DIR - - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r $OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log + - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head $OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log - mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$EXTERNAL_SHARE_DIR From d39f218215673ee39f2bf233092f97e0b69410ab Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 29 Dec 2015 19:38:57 +0100 Subject: [PATCH 5/6] added extra options for setting NFS SHARE --- .gitlab-ci.yml | 2 +- cmake_targets/autotests/run_exec_lte-softmodem_tests.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 092993340a..57c5c64ffb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ job1: - echo $EXTERNAL_SHARE_RESULTS_DIR - mkdir -p $NFS_TEST_RESULTS_DIR - mkdir -p $EXTERNAL_SHARE_RESULTS_DIR - - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head $OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log + - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR $OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log - mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$EXTERNAL_SHARE_DIR diff --git a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py index 67b6daed66..2b7431a718 100644 --- a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py +++ b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py @@ -905,7 +905,7 @@ def cleanOldProgramsAllMachines(oai_list, CleanOldProgs, CleanUpAluLteBox, Exmim threadList=[] for oai in oai_list: threadName="cleanup_thread_"+str(threadId) - thread=append(oaiCleanOldProgramThread(threadId, threadName, oai, CleanUpOldProgs, CleanUpAluLteBox, ExmimoRfStop)) + thread=oaiCleanOldProgramThread(threadId, threadName, oai, CleanUpOldProgs, CleanUpAluLteBox, ExmimoRfStop) threadList.append(thread) thread.start() threadId = threadId + 1 @@ -926,6 +926,7 @@ GitOAI5GRepoBranch='' GitOAI5GHeadVersion='' user='' pw='' +NFSResultsShare='' openairdir_local = os.environ.get('OPENAIR_DIR') if openairdir_local is None: print "Environment variable OPENAIR_DIR not set correctly" @@ -979,6 +980,9 @@ while i < len (sys.argv): elif arg == '-p': pw = sys.argv[i+1] i = i +1 + elif arg == '-n': + NFSResultsShare = sys.argv[i+1] + i = i +1 elif arg == '-h' : print "-d: low debug level" print "-dd: high debug level" @@ -992,6 +996,7 @@ while i < len (sys.argv): print "-5GRepoHeadVersion: Head commit on which to run tests (overrides the branch in test_case_list.xml)" print "-u: use the user name passed as argument" print "-p: use the password passed as an argument" + print "-n: Set the NFS share passed as an argument" sys.exit() else : print "Unrecongnized Option: <" + arg + ">. Use -h to see valid options" @@ -1380,7 +1385,7 @@ print "Deleting NFSTestResults Dir..." + res print "Copying files from GilabCI Runner Machine : " + host + "locallogdir = " + locallogdir + ", NFSTestsResultsDir = " + NFSTestsResultsDir #ssh = SSHSession(UEMachine , username=user, key_file=None, password=password) #ssh.get_all(logdir_UE , logdir_local + '/cmake_targets/autotests/log/'+ testcasename) -SSHSessionWrapper(UEMachine, user, None, password, NFSTestsResultsDir , locallogdir, "put_all") +SSHSessionWrapper('localhost', user, None, password, NFSTestsResultsDir , locallogdir, "put_all") sys.exit() From 7be87a27baeb8819db546a29d97c590ebf90930a Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Tue, 29 Dec 2015 20:05:26 +0100 Subject: [PATCH 6/6] added option for rsync to create remote share if it does not exist --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57c5c64ffb..36da36ec5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,10 +18,8 @@ job1: - EXTERNAL_SHARE_RESULTS_DIR=$EXTERNAL_SHARE_DIR/$git_branch/$git_head - echo $NFS_TEST_RESULTS_DIR - echo $EXTERNAL_SHARE_RESULTS_DIR - - mkdir -p $NFS_TEST_RESULTS_DIR - - mkdir -p $EXTERNAL_SHARE_RESULTS_DIR - - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR $OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log + - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log - mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log - - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR - - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$EXTERNAL_SHARE_DIR + - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " –rsync-path=”mkdir -p $NFS_TEST_RESULTS_DIR && rsync” $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR + - sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " –rsync-path=”mkdir -p $NFS_TEST_RESULTS_DIR && rsync” $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$EXTERNAL_SHARE_DIR