diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23b8a96573ad3dbaad700ec8c351fee7a04d027f..3d847c7344f46807dc7a5b866be1b45b80435ed5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,46 +1,26 @@
 stages:
-  - dummy1
-  - dummy2
+  - build
+  - test
 
-cache:
-  key: test-cache
-  paths:
-    - test.log
-    - node_modules
-    - build
-
-dummy-job1:
-  stage: dummy1
+compile-junit:
+  stage: build
   script:
-    - echo "print something 1"
-    - echo "something" > test.log
-    - ls
-    - cat test.log
+    - cd Junit; ./gradlew assemble;
 
-dummy-job2:
-  stage: dummy2
+api-test:
+  stage: test
   script:
-    - echo "print something 2"
-    - ls
-    - cat test.log
-  when: manual
-  artifacts:
-    paths:
-      - "*.log"
-    expire_in: 1 day
+    - cd api; ./runTest.sh
 
-
-dummy-job3:
-  stage: dummy2
+e2e-test:
+  stage: test
   script:
-    - echo "print something 3"
-  only:
-    - main
+    - cd e2e; protractor protractor.conf
 
-dummy-job4:
-  stage: dummy1
+unit-test:
+  stage: test
   script:
-    - echo "print something 4"
-  only:
-    changes:
-      - api/**
\ No newline at end of file
+    - cd Junit; ./gradlew test || echo ""
+  artifacts:
+    reports:
+      junit: 'Junit/build/test-results/junit-platform/*.xml'
\ No newline at end of file