From 0ddc93a5e94d89071e9ee8e79dadecc7dc464dc1 Mon Sep 17 00:00:00 2001
From: jung-geun <pieroot.02@gmail.com>
Date: Wed, 18 Sep 2024 14:32:53 +0000
Subject: [PATCH] Refactor file paths in Makefile, run_script.sh, and start.sh

---
 .gitlab-ci.yml           | 44 +++++++++++++++++++---------------------
 sonar-project.properties |  2 +-
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9458b2b..00b2c93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,3 @@
-image: 
-    name: sonarsource/sonar-scanner-cli:11.0
-    entrypoint: [""]
-
 variables:
   SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
   GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
@@ -12,36 +8,38 @@ stages:
 
 sonarqube-check:
   stage: sonarqube-check
-  # dependencies:
-  #   - get-binaries
-  #   - build
+  image: 
+    name: sonarsource/sonar-scanner-cli:11.0
+    entrypoint: [""]
+  variables:
+    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
+    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
   cache:
-    policy: pull
-    key: "${CI_COMMIT_SHORT_SHA}"
+    key: "${CI_JOB_NAME}"
     paths:
-      - sonar-scanner/
-      
-      
+      - .sonar/cache
   script: 
     - sonar-scanner
   allow_failure: true
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-    - if: $CI_COMMIT_BRANCH == 'master'
-    - if: $CI_COMMIT_BRANCH == 'main'
-    - if: $CI_COMMIT_BRANCH == 'develop'
+  only:
+    - merge_requests
+    - master
+    - main
+    - develop
 
 sonarqube-vulnerability-report:
   stage: sonarqube-vulnerability-report
   script:
-    - 'curl -u "${SONAR_TOKEN}:" "${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=pieroot_cloudflare-ddns_e6da100b-a671-4736-87ac-9a41acda99f6&branch=${CI_COMMIT_BRANCH}&pullRequest=${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json'
+    - 'curl -u "${SONAR_TOKEN}:" "${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=pieroot_cloudflare-ddns_AZIFhiXEwbr_NxNtXMWZ&branch=${CI_COMMIT_BRANCH}&pullRequest=${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json'
   allow_failure: true
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-    - if: $CI_COMMIT_BRANCH == 'master'
-    - if: $CI_COMMIT_BRANCH == 'main'
-    - if: $CI_COMMIT_BRANCH == 'develop'
+  only:
+    - merge_requests
+    - master
+    - main
+    - develop
   artifacts:
     expire_in: 1 day
     reports:
       sast: gl-sast-sonar-report.json
+  dependencies:
+    - sonarqube-check
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
index 10f90bf..ae4bcb1 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,3 +1,3 @@
-sonar.projectKey=pieroot_cloudflare-ddns_e6da100b-a671-4736-87ac-9a41acda99f6
+sonar.projectKey=pieroot_cloudflare-ddns_AZIFhiXEwbr_NxNtXMWZ
 sonar.qualitygate.wait=true
 sonar.python.version=3.10
\ No newline at end of file