From b290f95de548805dbb5f7b861319ebffe272bf25 Mon Sep 17 00:00:00 2001 From: jahangir Date: Sat, 22 Nov 2025 10:02:28 -0500 Subject: [PATCH] Resolve merge conflicts --- Jenkinsfile | 33 +++++++++++++++++++++++++++++++++ README.md | 5 +++++ pipeline_diagram.png | Bin 0 -> 13683 bytes selenium-tests/SampleTest.java | 1 + selenium-tests/TestBase.java | 1 + sonar-project.properties | 2 ++ 6 files changed, 42 insertions(+) create mode 100644 pipeline_diagram.png create mode 100644 selenium-tests/SampleTest.java create mode 100644 selenium-tests/TestBase.java create mode 100644 sonar-project.properties diff --git a/Jenkinsfile b/Jenkinsfile index be7508be5..726929660 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,5 @@ pipeline { +<<<<<<< HEAD agent any /* @@ -31,10 +32,33 @@ pipeline { } stage('UNIT TEST'){ +======= + agent any + stages { + stage('Checkout') { + steps { + git 'https://github.com/example/repo.git' + } + } + stage('Build') { + steps { + sh 'mvn clean package' + } + } + stage('SonarQube Analysis') { + steps { + withSonarQubeEnv('SonarQube') { + sh 'mvn sonar:sonar' + } + } + } + stage('Selenium Tests') { +>>>>>>> d416274 (adding new proj repo) steps { sh 'mvn test' } } +<<<<<<< HEAD stage('INTEGRATION TEST'){ steps { @@ -119,3 +143,12 @@ pipeline { } +======= + stage('Archive Artifact') { + steps { + archiveArtifacts artifacts: 'target/*.jar' + } + } + } +} +>>>>>>> d416274 (adding new proj repo) diff --git a/README.md b/README.md index 88fd3cbba..7514acfef 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Prerequisites # - JDK 11 @@ -23,3 +24,7 @@ sql dump file: - > mysql -u -p accounts < db_backup.sql +======= +# CI/CD DevOps Project +Includes Jenkins, Selenium, SonarQube and Jira integration. +>>>>>>> d416274 (adding new proj repo) diff --git a/pipeline_diagram.png b/pipeline_diagram.png new file mode 100644 index 0000000000000000000000000000000000000000..80dfdbed0d2825f779e437d172aeced0d53a8d88 GIT binary patch literal 13683 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 Z|857NNT