Browse Source

run baangt Testruns with noCloneXls=False

aguryev 3 years ago
parent
commit
f974eecc45
5 changed files with 7 additions and 5 deletions
  1. 2 2
      api/Dockerfile
  2. 1 0
      api/app/tasks.py
  3. 2 1
      api/ini/mail.ini
  4. 2 2
      run_services_db_permanent.sh
  5. BIN
      ui/testrun.db

+ 2 - 2
api/Dockerfile

@@ -60,7 +60,7 @@ RUN venv/bin/pip install gunicorn pymysql cryptography psycopg2
 # install package requirements
 COPY requirements.txt requirements.txt
 RUN venv/bin/pip install -r requirements.txt
-RUN venv/bin/pip install xlsclone
+#RUN venv/bin/pip install xlsclone
 
 # copy package
 ADD . /baangt
@@ -68,7 +68,7 @@ ADD . /baangt
 RUN chmod +x runservice.sh runservice.rq.sh runservice.dev.sh
 
 # add patches here
-COPY patch/DataBaseORM.py /baangt/venv/lib/python3.8/site-packages/baangt/base/DataBaseORM.py
+#COPY patch/DataBaseORM.py /baangt/venv/lib/python3.8/site-packages/baangt/base/DataBaseORM.py
 
 EXPOSE 5000
 ENTRYPOINT ["./runservice.sh"]

+ 1 - 0
api/app/tasks.py

@@ -52,6 +52,7 @@ def run_testrun(testRunName, globalSettings, testRunDict, testRunId):
 		globalSettingsFileNameAndPath=path_to_globals,
 		testRunDict=testRunDict,
 		uuid=testRunId,
+		noCloneXls=True,
 	)
 
 	# upload files to file-service: logfile, results

+ 2 - 1
api/ini/mail.ini

@@ -1,8 +1,9 @@
 [Default]
-telegramchannel = 
+confluence-base-url = 
 sendmailto = 
 notificationwithattachment = False
 mswebhook = 
 slackwebhook = 
 telegrambot = 
+telegramchannel = 
 

+ 2 - 2
run_services_db_permanent.sh

@@ -77,8 +77,8 @@ echo Starting Redis Worker...
 docker run -d --name rq-worker  \
     -e BAANGT_DATAFILE_HOST=172.17.0.1:${ports[2]} --rm \
     -e DATABASE_URL=postgresql://baangt:12345@172.17.0.1:${ports[4]}/execution \
-    -e REDIS_URL=redis://172.17.0.1:${ports[3]}/0 --entrypoint rq \
-    baangt-api:latest worker -u redis://172.17.0.1:${ports[3]}/0 baangt-tasks
+    -e REDIS_URL=redis://172.17.0.1:${ports[3]}/0 --entrypoint "./runservice.rq.sh" \
+    baangt-api:latest
 
 # postgres
 echo

BIN
ui/testrun.db