From e0066cf9c0ee2cd7da2c53c20c27047d909ccbaf Mon Sep 17 00:00:00 2001
From: tholok97 <thomas.lokkeborg@mimer.no>
Date: Wed, 19 Feb 2020 14:39:14 +0100
Subject: [PATCH] fikset testjobber
.gitlab-ci.yaml kom fra et tidligere repository vi jobbet med som gruppe
---
.gitlab-ci.yml | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afc787c..1380d0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,13 +29,10 @@ job_test_gui_ubuntu_vnc:
before_script:
- apt-get install -y libgl1-mesa-glx
script:
- # because not already in image
- pip install pyside2
# -platform because running with a screen is not supported
# https://stackoverflow.com/questions/17106315/failed-to-load-platform-plugin-xcb-while-launching-qt5-app-on-linux-without
- - python3 ./testingtest/test_main.py -platform vnc
- - QT_QPA_PLATFORM=vnc python3 ./testintestpyside/test_main.py
- - QT_QPA_PLATFORM=vnc python3 ./gui_nikko/test_widgets.py
+ - QT_QPA_PLATFORM=vnc python3 ./soitool/main.py
job_test_gui_windows:
stage: test
@@ -43,9 +40,7 @@ job_test_gui_windows:
- ci-windows
script:
- python --version
- - python ./testingtest/test_main.py
- - python ./testintestpyside/test_main.py
- - python ./gui_nikko/test_widgets.py
+ - python ./soitool/main.py
job_test_gui_ubuntu:
stage: test
@@ -53,7 +48,5 @@ job_test_gui_ubuntu:
- ci-ubuntu
script:
- python3 --version
- - DISPLAY=':10.0' python3 ./testingtest/test_main.py
- - DISPLAY=':10.0' python3 ./testintestpyside/test_main.py
- - DISPLAY=':10.0' python3 ./gui_nikko/test_widgets.py
+ - DISPLAY=':10.0' python3 ./soitool/main.py
--
GitLab