From 0c49930fdc9f117b8316e55492586db58ed6b052 Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Wed, 3 Jul 2019 10:32:29 +0300
Subject: [PATCH] gitlab-ci fix
---
.gitlab-ci.yml | 12 ++++++++++++
.gitlab.ci.yml | 11 -----------
2 files changed, 12 insertions(+), 11 deletions(-)
delete mode 100644 .gitlab.ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 978f37b..800f6fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
stages:
- purge
- e2e-test
+ - analysis
purge-old-containers:
image:
@@ -40,3 +41,14 @@ e2e-testing:
- echo 'create extension "uuid-ossp";' | docker exec -i postgis psql -U postgres ehasa
allow_failure: true
+sonarqube:
+ stage: analysis
+ image: ciricihq/gitlab-sonar-scanner
+ tags: ['docker']
+ only:
+ - Development
+ variables:
+ SONAR_URL: http://10.166.0.3:9000
+ SONAR_ANALYSIS_MODE: publish
+ script:
+ - gitlab-sonar-scanner -Dsonar.host.url=http://10.166.0.3:9000 -Dsonar.projectKey=backend -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PASS -Dsonar.gitlab.project_id=$CI_PROJECT_ID -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
deleted file mode 100644
index acd85d2..0000000
--- a/.gitlab.ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-stages:
- - analysis
-
-sonarqube:
- stage: analysis
- image: ciricihq/gitlab-sonar-scanner
- variables:
- SONAR_URL: http://10.166.0.3:9000
- SONAR_ANALYSIS_MODE: publish
- script:
- - gitlab-sonar-scanner -Dsonar.host.url=http://10.166.0.3:9000 -Dsonar.projectKey=backend -Dsonar.login=$SONAR_USER -Dsonar.password=$SONAR_PASS -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.commit_sha=$CI_COMMIT_REF -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
--
GitLab