From 0d03b63b7c513690fbb963c23b420f0d858ed997 Mon Sep 17 00:00:00 2001
From: marius <marius@because-security.com>
Date: Mon, 7 Jan 2019 16:53:32 +0100
Subject: [PATCH] correcting the gitlab ci

---
 .gitlab-ci-yml | 13 -------------
 .gitlab-ci.yml | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 .gitlab-ci-yml
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci-yml b/.gitlab-ci-yml
deleted file mode 100644
index de957aa..0000000
--- a/.gitlab-ci-yml
+++ /dev/null
@@ -1,13 +0,0 @@
-sonarqube_master_job:
-  stage: test
-  only:
-    - master
-  script:
-    - mvn --batch-mode verify sonar:sonar -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_LOGIN
-
-sonarqube_preview_feature_job:
-  stage: test
-  script:
-    - git checkout origin/master
-    - git merge $CI_COMMIT_REF --no-commit --no-ff
-    - mvn --batch-mode verify sonar:sonar -Dsonar.host.url=http://192.168.1.2:9000 -Dsonar.login=05cb9755e10655966bf7931a57efcd7b276dd8b05cb9755e10655966bf7931a57efcd7b276dd8b66 -Dsonar.analysis.mode=preview -Dsonar.gitlab.project_id=$CI_PROJECT_PATH -Dsonar.gitlab.commit_sha=$CI_COMMIT_REF -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..c3f0a1d
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,14 @@
+sonarqube_master_job:
+  stage: test
+  only:
+    - master
+  script:
+    - mvn --batch-mode verify sonar:sonar -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_LOGIN
+
+sonarqube_preview_feature_job:
+  stage: test
+  script:
+    - git checkout origin/master
+    - git merge $CI_COMMIT_REF --no-commit --no-ff
+    - mvn --batch-mode verify sonar:sonar -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_LOGIN -Dsonar.analysis.mode=preview -Dsonar.gitlab.project_id=$CI_PROJECT_PATH -Dsonar.gitlab.commit_sha=$CI_COMMIT_REF -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
+