From 760413c0bbd76981a6fe2cd4999618536ed244ac Mon Sep 17 00:00:00 2001 From: mandeepdhiman123 Date: Mon, 7 Sep 2020 15:00:00 +0530 Subject: [PATCH] setup cronjob --- mosip-security-playbook/group_vars/all.yml | 2 +- .../roles/api-security/tasks/main.yml | 2 + .../functional-test-setup/tasks/main.yml | 11 +- .../utils/python-lib/RoboFunctionalTest.py | 10 +- mosip-security-playbook/utils/settings.xml | 274 +++--------------- 5 files changed, 55 insertions(+), 244 deletions(-) diff --git a/mosip-security-playbook/group_vars/all.yml b/mosip-security-playbook/group_vars/all.yml index 8dee389..f8f75cd 100644 --- a/mosip-security-playbook/group_vars/all.yml +++ b/mosip-security-playbook/group_vars/all.yml @@ -27,7 +27,7 @@ scan_policy: 'Default Policy' #functional testrig variables testrig_version: '1.1' -testrig_dir: '{{tools_dir}}/mosip-functional-tests-{{ testrig_version }}' +testrig_dir: '{{tools_dir}}/mosip-functional-tests-{{ testrig_version }}/automationtests/target/' functional_test_report_dir: '{{report_dir}}/functional-test/' module: 'prereg' envuser: 'qa' diff --git a/mosip-security-playbook/roles/api-security/tasks/main.yml b/mosip-security-playbook/roles/api-security/tasks/main.yml index babff45..547f71f 100644 --- a/mosip-security-playbook/roles/api-security/tasks/main.yml +++ b/mosip-security-playbook/roles/api-security/tasks/main.yml @@ -83,3 +83,5 @@ #- debug: # var: robo # verbosity: 4 + + diff --git a/mosip-security-playbook/roles/functional-test-setup/tasks/main.yml b/mosip-security-playbook/roles/functional-test-setup/tasks/main.yml index 6db0298..54c125f 100644 --- a/mosip-security-playbook/roles/functional-test-setup/tasks/main.yml +++ b/mosip-security-playbook/roles/functional-test-setup/tasks/main.yml @@ -41,5 +41,12 @@ when: check_for_rebuild.user_input | bool - name: Copy jar file to test testrig directory - command: "mv {{ testrig_dir }}/automationtests/target/*dependencies.jar {{ testrig_dir }}/automationtests/automationtests.jar" - when: check_for_rebuild.user_input | bool \ No newline at end of file + shell: "mv {{ testrig_dir }}/*dependencies.jar {{ testrig_dir }}/automationtests.jar" + when: check_for_rebuild.user_input | bool + +- name: Sceduling Cronjob for test-rig + cron: + name: "functional-test" + minute: "30" + hour: "15" + job: "cd {{ testrig_dir }} && java -jar -Dmodules=all -Denv.user=qa -Denv.endpoint=https://qa.mosip.net -Denv.testLevel=smokeAndRegression automationtests.jar" \ No newline at end of file diff --git a/mosip-security-playbook/utils/python-lib/RoboFunctionalTest.py b/mosip-security-playbook/utils/python-lib/RoboFunctionalTest.py index 8920506..b06b45f 100644 --- a/mosip-security-playbook/utils/python-lib/RoboFunctionalTest.py +++ b/mosip-security-playbook/utils/python-lib/RoboFunctionalTest.py @@ -34,13 +34,13 @@ def start_functional_test(self, path, module, envuser, endpoint, testlevel, host | start functional test | path | host | port | """ try: - cmd = 'java -jar -Dmodules='+module+' -Denv.user='+envuser+' -Denv.endpoint='+endpoint+' -Denv.testLevel='+testlevel+' -Dhttps.proxyHost='+host+' -Dhttps.proxyPort='+port+' -Dhttp.proxyHost='+host+' -Dhttp.proxyPort='+port+' '+path+'/automationtests.jar' + cmd = 'cd '+ path+ ' && java -jar -Dmodules='+module+' -Denv.user='+envuser+' -Denv.endpoint='+endpoint+' -Denv.testLevel='+testlevel+' -Dhttps.proxyHost='+host+' -Dhttps.proxyPort='+port+' -Dhttp.proxyHost='+host+' -Dhttp.proxyPort='+port+' automationtests.jar' os.popen(cmd) - time.sleep(10) - pid = 'jcmd | grep automationtests | cut -d "%s" -f 1' + time.sleep(60) + pid = 'jcmd | grep automationtests | cut -d " " -f 1' status = subprocess.Popen(pid) - while (status != " " or status != "" or status != null): + while status != "" or status.isspace()==False: logger.info("Test Rig is in progress") time.sleep(60) except IOError as e: - print("Please check the options") + logger.info("Please check the options") diff --git a/mosip-security-playbook/utils/settings.xml b/mosip-security-playbook/utils/settings.xml index dd5b81c..4319210 100644 --- a/mosip-security-playbook/utils/settings.xml +++ b/mosip-security-playbook/utils/settings.xml @@ -1,237 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - central - libs-release - http://104.211.246.17:8040/artifactory/libs-release - - - - snapshots - libs-snapshot - http://104.211.246.17:8040/artifactory/libs-snapshot - - - - - - false - - central - libs-release - http://104.211.246.17:8040/artifactory/libs-release - - - - snapshots - libs-snapshot - http://104.211.246.17:8040/artifactory/libs-snapshot - - - artifactory - - - - artifactory - + + + + ossrh + + + + + + ossrh + + true + + + + + allow-snapshots + true + + + snapshots-repo + https://oss.sonatype.org/content/repositories/snapshots + false + true + + + + releases-repo + https://oss.sonatype.org/service/local/staging/deploy/maven2 + false + false + + + + + + +