From 00782c8ca101ef7c427ab2a93b1947ab979f0265 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Wed, 30 Apr 2025 16:05:47 +0530 Subject: [PATCH 01/14] added soanr qube and github actons --- .github/CODEOWNERS | 2 + .github/workflows/Processors_CI_Workflow.yaml | 89 +++++++++++++++++++ SonarQG.sh | 71 +++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 .github/CODEOWNERS create mode 100644 .github/workflows/Processors_CI_Workflow.yaml create mode 100644 SonarQG.sh diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..7c16d85f7 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# Global rule: +* @brahmanand1 @spal-sapient @aksshriv1 @shunaray @kunkambl @mampacch @nagendra-battala @Chittauri @gipathak @risshukl0 @ananthpal @manoj-srivastava \ No newline at end of file diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml new file mode 100644 index 000000000..6e468ec07 --- /dev/null +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -0,0 +1,89 @@ +name: Processors_CI_Workflow # Define the name of the workflow + +# Define when the workflow should trigger +on: + pull_request: + types: + - labeled # Trigger when a label is added + - unlabeled # Trigger when a label is removed + - synchronize # Trigger when commits are pushed to the PR + - opened # Trigger when a PR is opened + - edited # Trigger when a PR title or description is edited + - ready_for_review # Trigger when a draft PR is marked as ready + - reopened # Trigger when a closed PR is reopened + - unlocked # Trigger when a locked PR is unlocked + branches: [master, develop, qa-master] # Apply to these branches + pull_request_review: + types: [edited, dismissed] # Trigger when a review is edited or dismissed + branches: [master, develop, qa-master] + workflow_dispatch: # Allow manual triggering of the workflow + +# Define environment variables +env: + GITHUB_HEAD_NAME: $GITHUB_HEAD_REF # Store the head branch name + sonartoken: ${{ secrets.SONARQUBE_TOKEN }} # Secret for SonarQube authentication + sonarurl: ${{ secrets.SONARURL }} # SonarQube URL stored in secrets + +jobs: + + # ✅ Building & Testing Processors + processors_ci: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Set Up Java + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '17' + + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Build & Test Jira Processor + run: mvn clean install -Pjira-processor -Ddockerfile.skip=true + + - name: Build & Test Azure Board Processor + run: mvn clean install -Pazure-board-processor -Ddockerfile.skip=true + + - name: Build & Test DevOps Processor + run: mvn clean install -Pdevops-processor -Ddockerfile.skip=true + + - name: Build & Test Azure Pipeline Repo Processor + run: mvn clean install -Pazure-pipeline-repo -Ddockerfile.skip=true + + - name: SonarQube Analysis - Processors + run: | + mvn sonar:sonar -Dsonar.projectKey=ENGINEERING.KPIDASHBOARD.PROCESSORS \ + -Dsonar.projectName=ENGINEERING.KPIDASHBOARD.PROCESSORS \ + -Dsonar.branch.name=${{ env.GITHUB_HEAD_NAME }} \ + -Dsonar.host.url=${{ secrets.SONARQUBE_HOST }} \ + -Dsonar.login=${{ secrets.SONARQUBE_TOKEN }} -f pom.xml + + - name: Check SonarQube Quality Gate - Processors + run: | + chmod +x SonarQG.sh + ./SonarQG.sh ./target/sonar/report-task.txt + + # ✅ Final Job to Ensure Completion + GitHub_CI_Complete: + needs: [processors_ci] + if: always() + runs-on: ubuntu-latest + steps: + - name: Check Job Status + run: | + if [[ "${{ needs.processors_ci.result }}" == "failure" || \ + "${{ needs.processors_ci.result }}" == "cancelled" ]]; then + echo "❌ One or more jobs failed or were cancelled. Failing CI." + exit 1 + else + echo "✅ All relevant jobs have passed." + fi \ No newline at end of file diff --git a/SonarQG.sh b/SonarQG.sh new file mode 100644 index 000000000..b4b8bd779 --- /dev/null +++ b/SonarQG.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash +# this script checks the status of a quality gate for a particular analysisID +# approach taken from https://docs.sonarqube.org/display/SONARQUBE53/Breaking+the+CI+Build +# When SonarScanner executes, the compute engine task is given an id +# The status of this task, and analysisId for the task can be checked at +# /api/ce/task?id=taskid +# When the status is SUCCESS, the quality gate status can be checked at +# /api/qualitygates/project_status?analysisId=analysisId +#set errexit +#set pipefail +#set nounset + +# in newer versions of sonar scanner the default report-task.txt location may be different +#REPORT_PATH="./customapi/target/sonar/report-task.txt" +#REPORT_PATH=".sonar/report-task.txt" +CE_TASK_ID_KEY="ceTaskId=" + +#SONAR_ACCESS_TOKEN="9000" +SLEEP_TIME=5 + +echo "QG Script --> Using SonarQube instance ${sonarurl}" + +# get the compute engine task id +ce_task_id=$(cat $1 | grep $CE_TASK_ID_KEY | cut -d'=' -f2) +echo "QG Script --> Using task id of ${ce_task_id}" + +if [ -z "$ce_task_id" ]; then + echo "QG Script --> No task id found" + exit 1 +fi + +# grab the status of the task +# if CANCELLED or FAILED, fail the Build +# if SUCCESS, stop waiting and grab the analysisId +wait_for_success=true + +while [ "${wait_for_success}" = "true" ] +do + ce_status=$(curl --user ${sonartoken}: ${sonarurl}/api/ce/task?id="${ce_task_id}" | jq -r .task.status) + + echo "QG Script --> Status of SonarQube task is ${ce_status}" + + if [ "${ce_status}" = "CANCELLED" ]; then + echo "QG Script --> SonarQube Compute job has been cancelled - exiting with error" + exit 1 + fi + + if [ "${ce_status}" = "FAILED" ]; then + echo "QG Script --> SonarQube Compute job has failed - exiting with error" + exit 1 + fi + + if [ "${ce_status}" = "SUCCESS" ]; then + wait_for_success=false + fi + + sleep 10 + +done + +ce_analysis_id=$(curl --user ${sonartoken}: ${sonarurl}/api/ce/task?id=$ce_task_id | jq -r .task.analysisId) +echo "QG Script --> Using analysis id of ${ce_analysis_id}" + +# get the status of the quality gate for this analysisId +qg_status=$(curl --user ${sonartoken}: ${sonarurl}/api/qualitygates/project_status?analysisId="${ce_analysis_id}" | jq -r .projectStatus.status) +echo "QG Script --> Quality Gate status is ${qg_status}" + +if [ "${qg_status}" != "OK" ]; then + echo "Pipeline aborted due to quality gate failure" + exit 1 +fi From 60a745a353d9d5220b328fa03bc2b7a08e4eb7d9 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Wed, 30 Apr 2025 17:09:19 +0530 Subject: [PATCH 02/14] added common dependencies --- .github/workflows/Processors_CI_Workflow.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index 6e468ec07..848305d56 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -45,7 +45,13 @@ jobs: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | - ${{ runner.os }}-maven- + ${{ runner.os }}-maven- + + - name: Clone & Build knowhow-common dependency + run: | + git clone https://github.com/PublicisSapient/knowhow-common.git + cd knowhow-common + mvn clean install -Ddockerfile.skip=true -X - name: Build & Test Jira Processor run: mvn clean install -Pjira-processor -Ddockerfile.skip=true From 9a2ce99a7cd9895758cd9c31f6bfb32bce960608 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 14:38:27 +0530 Subject: [PATCH 03/14] HARDCODED THE common version --- jira/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jira/pom.xml b/jira/pom.xml index 1f96ef5bf..ed0be1b76 100644 --- a/jira/pom.xml +++ b/jira/pom.xml @@ -93,7 +93,7 @@ com.publicissapient.kpidashboard common - ${project.version} + 13.1.0-SNAPSHOT compile From debc8b1c4cf7201211447a9f1dfc27a9eba16eed Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 14:44:34 +0530 Subject: [PATCH 04/14] added extract stage --- .github/workflows/Processors_CI_Workflow.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index 848305d56..180f96750 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -52,6 +52,16 @@ jobs: git clone https://github.com/PublicisSapient/knowhow-common.git cd knowhow-common mvn clean install -Ddockerfile.skip=true -X + + - name: Extract common version and inject into Jira pom + run: | + # Get version from knowhow-common pom.xml + COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) + echo "Using common version: $COMMON_VERSION" + + # Inject into dependencyManagement block in jira-processor/pom.xml + sed -i "s|.*|$COMMON_VERSION|" \ + $(find . -name pom.xml | grep jira-processor | head -n 1) - name: Build & Test Jira Processor run: mvn clean install -Pjira-processor -Ddockerfile.skip=true From c3884abf14d7ba8ed5d9f68080fb6f60dc27ce41 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 14:47:30 +0530 Subject: [PATCH 05/14] added dependencies --- .github/workflows/Processors_CI_Workflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index 180f96750..c5b8303cb 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -55,6 +55,7 @@ jobs: - name: Extract common version and inject into Jira pom run: | + sudo apt-get update && sudo apt-get install -y libxml2-utils # Get version from knowhow-common pom.xml COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) echo "Using common version: $COMMON_VERSION" From d06ac87ddb2fcc105f0448d443bc2c8c20712b62 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 14:54:27 +0530 Subject: [PATCH 06/14] added cd --- .github/workflows/Processors_CI_Workflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index c5b8303cb..00760b8fb 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -57,6 +57,7 @@ jobs: run: | sudo apt-get update && sudo apt-get install -y libxml2-utils # Get version from knowhow-common pom.xml + cd knowhow-common COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) echo "Using common version: $COMMON_VERSION" From c0327925a61b1e7b35ccb9b5495d7e78f9b8c130 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 15:00:10 +0530 Subject: [PATCH 07/14] combined --- .github/workflows/Processors_CI_Workflow.yaml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index 00760b8fb..498ec99be 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -52,18 +52,26 @@ jobs: git clone https://github.com/PublicisSapient/knowhow-common.git cd knowhow-common mvn clean install -Ddockerfile.skip=true -X - - - name: Extract common version and inject into Jira pom - run: | sudo apt-get update && sudo apt-get install -y libxml2-utils # Get version from knowhow-common pom.xml - cd knowhow-common COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) echo "Using common version: $COMMON_VERSION" - + ls # Inject into dependencyManagement block in jira-processor/pom.xml sed -i "s|.*|$COMMON_VERSION|" \ $(find . -name pom.xml | grep jira-processor | head -n 1) + + # - name: Extract common version and inject into Jira pom + # run: | + # sudo apt-get update && sudo apt-get install -y libxml2-utils + # # Get version from knowhow-common pom.xml + # cd knowhow-common + # COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) + # echo "Using common version: $COMMON_VERSION" + + # # Inject into dependencyManagement block in jira-processor/pom.xml + # sed -i "s|.*|$COMMON_VERSION|" \ + # $(find . -name pom.xml | grep jira-processor | head -n 1) - name: Build & Test Jira Processor run: mvn clean install -Pjira-processor -Ddockerfile.skip=true From a5678fc9371110ed9640752b77418fc904e8cbb5 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 15:08:35 +0530 Subject: [PATCH 08/14] test --- .github/workflows/Processors_CI_Workflow.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index 498ec99be..b5109d1b0 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -49,14 +49,17 @@ jobs: - name: Clone & Build knowhow-common dependency run: | + ls -R git clone https://github.com/PublicisSapient/knowhow-common.git cd knowhow-common + ls -R mvn clean install -Ddockerfile.skip=true -X sudo apt-get update && sudo apt-get install -y libxml2-utils # Get version from knowhow-common pom.xml + cd .. COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) echo "Using common version: $COMMON_VERSION" - ls + # Inject into dependencyManagement block in jira-processor/pom.xml sed -i "s|.*|$COMMON_VERSION|" \ $(find . -name pom.xml | grep jira-processor | head -n 1) From 93f63726945664f6f643b8751fddaa42c59883b5 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 15:11:54 +0530 Subject: [PATCH 09/14] test --- .github/workflows/Processors_CI_Workflow.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index b5109d1b0..04c1a2dc1 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -54,9 +54,14 @@ jobs: cd knowhow-common ls -R mvn clean install -Ddockerfile.skip=true -X + + - name: installing the dependencies + run: | sudo apt-get update && sudo apt-get install -y libxml2-utils # Get version from knowhow-common pom.xml - cd .. + - name: changing the version + run: | + ls -R COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) echo "Using common version: $COMMON_VERSION" From ea0010e5cdb8401eddc3a34c47e8c364c4e8bc8b Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 15:24:50 +0530 Subject: [PATCH 10/14] updated the version --- .github/workflows/Processors_CI_Workflow.yaml | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index 04c1a2dc1..e07dcc613 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -54,20 +54,27 @@ jobs: cd knowhow-common ls -R mvn clean install -Ddockerfile.skip=true -X - - - name: installing the dependencies - run: | - sudo apt-get update && sudo apt-get install -y libxml2-utils - # Get version from knowhow-common pom.xml - - name: changing the version + + - name: Get common version using Maven Help Plugin run: | - ls -R - COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) - echo "Using common version: $COMMON_VERSION" + cd knowhow-common + COMMON_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "COMMON_VERSION=$COMMON_VERSION" >> $GITHUB_ENV + + + # - name: installing the dependencies + # run: | + # sudo apt-get update && sudo apt-get install -y libxml2-utils + # # Get version from knowhow-common pom.xml + # - name: changing the version + # run: | + # ls -R + # COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) + # echo "Using common version: $COMMON_VERSION" - # Inject into dependencyManagement block in jira-processor/pom.xml - sed -i "s|.*|$COMMON_VERSION|" \ - $(find . -name pom.xml | grep jira-processor | head -n 1) + # # Inject into dependencyManagement block in jira-processor/pom.xml + # sed -i "s|.*|$COMMON_VERSION|" \ + # $(find . -name pom.xml | grep jira-processor | head -n 1) # - name: Extract common version and inject into Jira pom # run: | From 86bb1352eb33587b0875420d0fa3d88b1aff8817 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 15:28:56 +0530 Subject: [PATCH 11/14] test --- .github/workflows/Processors_CI_Workflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index e07dcc613..c11fe6e08 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -59,6 +59,7 @@ jobs: run: | cd knowhow-common COMMON_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "COMMON_VERSION=$COMMON_VERSION" echo "COMMON_VERSION=$COMMON_VERSION" >> $GITHUB_ENV From 61d5c024c3c4034cd3ede09beadf7089b4e4ddee Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 2 May 2025 18:18:43 +0530 Subject: [PATCH 12/14] updated the version common --- .github/workflows/Processors_CI_Workflow.yaml | 36 +++---------------- argocd/pom.xml | 2 +- azure-boards/pom.xml | 2 +- azure-pipeline/pom.xml | 2 +- azure-repo/pom.xml | 2 +- bamboo/pom.xml | 2 +- bitbucket/pom.xml | 2 +- github-action/pom.xml | 2 +- github/pom.xml | 2 +- gitlab/pom.xml | 2 +- jenkins/pom.xml | 2 +- jira-xray-zephyr-squad/pom.xml | 2 +- jira-zephyr-scale/pom.xml | 2 +- jira/pom.xml | 2 +- sonar/pom.xml | 2 +- teamcity/pom.xml | 2 +- 16 files changed, 20 insertions(+), 46 deletions(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index c11fe6e08..75c6326ca 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -62,44 +62,18 @@ jobs: echo "COMMON_VERSION=$COMMON_VERSION" echo "COMMON_VERSION=$COMMON_VERSION" >> $GITHUB_ENV - - # - name: installing the dependencies - # run: | - # sudo apt-get update && sudo apt-get install -y libxml2-utils - # # Get version from knowhow-common pom.xml - # - name: changing the version - # run: | - # ls -R - # COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) - # echo "Using common version: $COMMON_VERSION" - - # # Inject into dependencyManagement block in jira-processor/pom.xml - # sed -i "s|.*|$COMMON_VERSION|" \ - # $(find . -name pom.xml | grep jira-processor | head -n 1) - - # - name: Extract common version and inject into Jira pom - # run: | - # sudo apt-get update && sudo apt-get install -y libxml2-utils - # # Get version from knowhow-common pom.xml - # cd knowhow-common - # COMMON_VERSION=$(xmllint --xpath "string(//project/version)" knowhow-common/pom.xml) - # echo "Using common version: $COMMON_VERSION" - - # # Inject into dependencyManagement block in jira-processor/pom.xml - # sed -i "s|.*|$COMMON_VERSION|" \ - # $(find . -name pom.xml | grep jira-processor | head -n 1) - - name: Build & Test Jira Processor - run: mvn clean install -Pjira-processor -Ddockerfile.skip=true + run: | + mvn clean install -Pjira-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION - name: Build & Test Azure Board Processor - run: mvn clean install -Pazure-board-processor -Ddockerfile.skip=true + run: mvn clean install -Pazure-board-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION - name: Build & Test DevOps Processor - run: mvn clean install -Pdevops-processor -Ddockerfile.skip=true + run: mvn clean install -Pdevops-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION - name: Build & Test Azure Pipeline Repo Processor - run: mvn clean install -Pazure-pipeline-repo -Ddockerfile.skip=true + run: mvn clean install -Pazure-pipeline-repo -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION - name: SonarQube Analysis - Processors run: | diff --git a/argocd/pom.xml b/argocd/pom.xml index 058475fa0..08f32173a 100644 --- a/argocd/pom.xml +++ b/argocd/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} org.projectlombok diff --git a/azure-boards/pom.xml b/azure-boards/pom.xml index 7fadad9b9..467e9eb13 100644 --- a/azure-boards/pom.xml +++ b/azure-boards/pom.xml @@ -57,7 +57,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} compile diff --git a/azure-pipeline/pom.xml b/azure-pipeline/pom.xml index b19fa2739..38e6d23b9 100644 --- a/azure-pipeline/pom.xml +++ b/azure-pipeline/pom.xml @@ -59,7 +59,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/azure-repo/pom.xml b/azure-repo/pom.xml index a2b571b3f..5f5746dd8 100644 --- a/azure-repo/pom.xml +++ b/azure-repo/pom.xml @@ -50,7 +50,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/bamboo/pom.xml b/bamboo/pom.xml index 684059348..81b5bc24b 100644 --- a/bamboo/pom.xml +++ b/bamboo/pom.xml @@ -61,7 +61,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/bitbucket/pom.xml b/bitbucket/pom.xml index 68533a0b7..4727f1fbe 100644 --- a/bitbucket/pom.xml +++ b/bitbucket/pom.xml @@ -57,7 +57,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/github-action/pom.xml b/github-action/pom.xml index a2e36a43b..31f64044c 100644 --- a/github-action/pom.xml +++ b/github-action/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/github/pom.xml b/github/pom.xml index d2624a40f..15cebc9dd 100644 --- a/github/pom.xml +++ b/github/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/gitlab/pom.xml b/gitlab/pom.xml index f7cac32a6..a5fdf2b92 100644 --- a/gitlab/pom.xml +++ b/gitlab/pom.xml @@ -56,7 +56,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/jenkins/pom.xml b/jenkins/pom.xml index f80dff70e..5abea7001 100644 --- a/jenkins/pom.xml +++ b/jenkins/pom.xml @@ -51,7 +51,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/jira-xray-zephyr-squad/pom.xml b/jira-xray-zephyr-squad/pom.xml index 302ec4fe6..9ade26dc7 100644 --- a/jira-xray-zephyr-squad/pom.xml +++ b/jira-xray-zephyr-squad/pom.xml @@ -63,7 +63,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} compile diff --git a/jira-zephyr-scale/pom.xml b/jira-zephyr-scale/pom.xml index 1db787eaa..fd86e841e 100644 --- a/jira-zephyr-scale/pom.xml +++ b/jira-zephyr-scale/pom.xml @@ -56,7 +56,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/jira/pom.xml b/jira/pom.xml index ed0be1b76..cf28d20bf 100644 --- a/jira/pom.xml +++ b/jira/pom.xml @@ -93,7 +93,7 @@ com.publicissapient.kpidashboard common - 13.1.0-SNAPSHOT + ${common.version} compile diff --git a/sonar/pom.xml b/sonar/pom.xml index 3c380bb77..f9a3b59e7 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback diff --git a/teamcity/pom.xml b/teamcity/pom.xml index 84cfc9957..f68191f7c 100644 --- a/teamcity/pom.xml +++ b/teamcity/pom.xml @@ -72,7 +72,7 @@ com.publicissapient.kpidashboard common - ${project.version} + ${common.version} ch.qos.logback From 33c33b04bf6feec91829d21718988c80c19d45f2 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Mon, 5 May 2025 11:26:19 +0530 Subject: [PATCH 13/14] added -Dcommon.version=$COMMON_VERSION for common --- .github/workflows/Processors_CI_Workflow.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index 75c6326ca..d46d52625 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -49,10 +49,8 @@ jobs: - name: Clone & Build knowhow-common dependency run: | - ls -R git clone https://github.com/PublicisSapient/knowhow-common.git cd knowhow-common - ls -R mvn clean install -Ddockerfile.skip=true -X - name: Get common version using Maven Help Plugin @@ -81,6 +79,7 @@ jobs: -Dsonar.projectName=ENGINEERING.KPIDASHBOARD.PROCESSORS \ -Dsonar.branch.name=${{ env.GITHUB_HEAD_NAME }} \ -Dsonar.host.url=${{ secrets.SONARQUBE_HOST }} \ + -Dcommon.version=$COMMON_VERSION \ -Dsonar.login=${{ secrets.SONARQUBE_TOKEN }} -f pom.xml - name: Check SonarQube Quality Gate - Processors From a47d2b08f4a7acde53aa2e6409dbb50c74e4080d Mon Sep 17 00:00:00 2001 From: rapkalya Date: Mon, 5 May 2025 15:04:14 +0530 Subject: [PATCH 14/14] added base branch --- .github/workflows/Processors_CI_Workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index d46d52625..f54ca8ab0 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -49,7 +49,7 @@ jobs: - name: Clone & Build knowhow-common dependency run: | - git clone https://github.com/PublicisSapient/knowhow-common.git + git clone --branch ${{ github.event.pull_request.base.ref }} https://github.com/PublicisSapient/knowhow-common.git cd knowhow-common mvn clean install -Ddockerfile.skip=true -X