modified jenkinsfile

Etimdevops2 · Etimdevops2 · commit 25d210fffb53 · 2024-09-07T15:26:23.000-05:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,18 +13,20 @@ pipeline {
         stage('Checkout for Build (dev)') {
             steps {
                 dir('/home/ec2-user/JavaCalculator') {
-                    git url: 'https://github.com/Etimdevops/JavaCalculator.git', branch: 'dev'
+                    // Checkout the dev branch for building the application
+                    git url: 'https://github.com/Etimdevops/JavaCalculator.git', branch: 'dev', poll: false
                 }
             }
         }
 
         stage('Build (dev)') {
             steps {
                 dir('/home/ec2-user/JavaCalculator') {
+                    // Run the build playbook with inventory from the master branch
                     ansiblePlaybook credentialsId: 'JenkinsAns', 
                                     disableHostKeyChecking: true, 
                                     installation: 'Ansible', 
-                                    inventory: 'hosts.ini', 
+                                    inventory: '/home/ec2-user/JavaCalculator/hosts.ini', 
                                     playbook: '01-build.yml'
                 }
             }
@@ -33,18 +35,20 @@ pipeline {
         stage('Checkout for Test (qa)') {
             steps {
                 dir('/home/ec2-user/JavaCalculator') {
-                    git url: 'https://github.com/Etimdevops/JavaCalculator.git', branch: 'qa'
+                    // Checkout the qa branch for running tests
+                    git url: 'https://github.com/Etimdevops/JavaCalculator.git', branch: 'qa', poll: false
                 }
             }
         }
 
         stage('Run Tests (qa)') {
             steps {
                 dir('/home/ec2-user/JavaCalculator') {
+                    // Run the test playbook with inventory from the master branch
                     ansiblePlaybook credentialsId: 'JenkinsAns', 
                                     disableHostKeyChecking: true, 
                                     installation: 'Ansible', 
-                                    inventory: 'hosts.ini', 
+                                    inventory: '/home/ec2-user/JavaCalculator/hosts.ini', 
                                     playbook: '02-test.yml'
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -13,18 +13,20 @@ pipeline {`
`13`	`13`	`stage('Checkout for Build (dev)') {`
`14`	`14`	`steps {`
`15`	`15`	`dir('/home/ec2-user/JavaCalculator') {`
`16`		`- git url: 'https://github.com/Etimdevops/JavaCalculator.git', branch: 'dev'`
	`16`	`+ // Checkout the dev branch for building the application`
	`17`	`+ git url: 'https://github.com/Etimdevops/JavaCalculator.git', branch: 'dev', poll: false`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`stage('Build (dev)') {`
`22`	`23`	`steps {`
`23`	`24`	`dir('/home/ec2-user/JavaCalculator') {`
	`25`	`+ // Run the build playbook with inventory from the master branch`
`24`	`26`	`ansiblePlaybook credentialsId: 'JenkinsAns',`
`25`	`27`	`disableHostKeyChecking: true,`
`26`	`28`	`installation: 'Ansible',`
`27`		`- inventory: 'hosts.ini',`
	`29`	`+ inventory: '/home/ec2-user/JavaCalculator/hosts.ini',`
`28`	`30`	`playbook: '01-build.yml'`
`29`	`31`	`}`
`30`	`32`	`}`
`@@ -33,18 +35,20 @@ pipeline {`
`33`	`35`	`stage('Checkout for Test (qa)') {`
`34`	`36`	`steps {`
`35`	`37`	`dir('/home/ec2-user/JavaCalculator') {`
`36`		`- git url: 'https://github.com/Etimdevops/JavaCalculator.git', branch: 'qa'`
	`38`	`+ // Checkout the qa branch for running tests`
	`39`	`+ git url: 'https://github.com/Etimdevops/JavaCalculator.git', branch: 'qa', poll: false`
`37`	`40`	`}`
`38`	`41`	`}`
`39`	`42`	`}`
`40`	`43`
`41`	`44`	`stage('Run Tests (qa)') {`
`42`	`45`	`steps {`
`43`	`46`	`dir('/home/ec2-user/JavaCalculator') {`
	`47`	`+ // Run the test playbook with inventory from the master branch`
`44`	`48`	`ansiblePlaybook credentialsId: 'JenkinsAns',`
`45`	`49`	`disableHostKeyChecking: true,`
`46`	`50`	`installation: 'Ansible',`
`47`		`- inventory: 'hosts.ini',`
	`51`	`+ inventory: '/home/ec2-user/JavaCalculator/hosts.ini',`
`48`	`52`	`playbook: '02-test.yml'`
`49`	`53`	`}`
`50`	`54`	`}`