From 96204abd465b3c5dae3c75d8bf21f63f2615e526 Mon Sep 17 00:00:00 2001 From: Aarif Date: Sat, 15 Apr 2023 17:17:38 +0530 Subject: [PATCH 1/6] initial commit --- src/main/java/com/javatechie/DevopsIntegrationApplication.java | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/javatechie/DevopsIntegrationApplication.java b/src/main/java/com/javatechie/DevopsIntegrationApplication.java index 32e26a16..8aa6c998 100644 --- a/src/main/java/com/javatechie/DevopsIntegrationApplication.java +++ b/src/main/java/com/javatechie/DevopsIntegrationApplication.java @@ -11,7 +11,7 @@ public class DevopsIntegrationApplication { @GetMapping public String message(){ - return "welcome to javatechie"; + return "welcome to Miftha"; } public static void main(String[] args) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3780835..8bbca19c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,4 +5,4 @@ management: include: - "*" server: - port: 8081 \ No newline at end of file + port: 8080 \ No newline at end of file From 5683574615ff3a67ddf4a0a0ff6f86d0dcc35e3a Mon Sep 17 00:00:00 2001 From: Bilal Haider <108573915+BilalHaiderRizvi@users.noreply.github.com> Date: Sun, 16 Apr 2023 07:05:24 +0530 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 87d5e9dd..2675fafb 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# devops-automation +# CI/CD pipeline project From b6fdbe51c6010e06852788e351147490c6d24332 Mon Sep 17 00:00:00 2001 From: Bilal Haider <108573915+BilalHaiderRizvi@users.noreply.github.com> Date: Sun, 16 Apr 2023 08:46:45 +0530 Subject: [PATCH 3/6] Update Jenkinsfile --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae953c63..9cbab5cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,13 +7,13 @@ pipeline { stage('Build Maven'){ steps{ checkout([$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/Java-Techie-jt/devops-automation']]]) - sh 'mvn clean install' + bat 'mvn clean install' } } stage('Build docker image'){ steps{ script{ - sh 'docker build -t javatechie/devops-integration .' + bat 'docker build -t bilalhaiderrizvi/devops-integration .' } } } @@ -21,10 +21,10 @@ pipeline { steps{ script{ withCredentials([string(credentialsId: 'dockerhub-pwd', variable: 'dockerhubpwd')]) { - sh 'docker login -u javatechie -p ${dockerhubpwd}' + bat 'docker login -u javatechie -p ${dockerhubpwd}' } - sh 'docker push javatechie/devops-integration' + bat 'docker push javatechie/devops-integration' } } } @@ -36,4 +36,4 @@ pipeline { } } } -} \ No newline at end of file +} From 6dcd4cfe9df5a927cbc6bcafb5affbba39459f55 Mon Sep 17 00:00:00 2001 From: Bilal Haider <108573915+BilalHaiderRizvi@users.noreply.github.com> Date: Mon, 17 Apr 2023 06:37:58 +0530 Subject: [PATCH 4/6] Update Jenkinsfile --- Jenkinsfile | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9cbab5cb..f709723b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,38 +1,35 @@ -pipeline { +pipeline{ + agent any + tools{ - maven 'maven_3_5_0' + maven 'maven3.8' } + stages{ + stage('Build Maven'){ steps{ - checkout([$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/Java-Techie-jt/devops-automation']]]) + checkout scmGit(branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/BilalHaiderRizvi/devops-automation']]) bat 'mvn clean install' } } - stage('Build docker image'){ + + stage('Build Docker Image'){ steps{ script{ - bat 'docker build -t bilalhaiderrizvi/devops-integration .' + bat 'docker build -t haiderbilal/devops-integration .' } } } - stage('Push image to Hub'){ - steps{ - script{ - withCredentials([string(credentialsId: 'dockerhub-pwd', variable: 'dockerhubpwd')]) { - bat 'docker login -u javatechie -p ${dockerhubpwd}' - -} - bat 'docker push javatechie/devops-integration' - } - } - } - stage('Deploy to k8s'){ - steps{ - script{ - kubernetesDeploy (configs: 'deploymentservice.yaml',kubeconfigId: 'k8sconfigpwd') + + stage('Push Image To DockerHub'){ + steps { + withCredentials([usernamePassword(credentialsId: 'docker-hub', usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) { + bat 'docker login -u %DOCKER_USERNAME% -p %DOCKER_PASSWORD%' } + bat 'docker push haiderbilal/devops-integration:latest' + } } } From 4dc95466d065c3cfa862f7b3ef220d989512ff8c Mon Sep 17 00:00:00 2001 From: Bilal Haider <108573915+BilalHaiderRizvi@users.noreply.github.com> Date: Mon, 17 Apr 2023 07:48:32 +0530 Subject: [PATCH 5/6] Update Jenkinsfile --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index f709723b..2660e685 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,5 +32,13 @@ pipeline{ } } + + stage('Deploy to k8s'){ + steps{ + script{ + kubernetesDeploy (configs: 'deploymentservice.yaml',kubeconfigId: 'k8sconfigpwd') + } + } + } } } From 4dc2734ee5a62fda14a4e82783f0ec482a3499fc Mon Sep 17 00:00:00 2001 From: Bilal Haider <108573915+BilalHaiderRizvi@users.noreply.github.com> Date: Sat, 29 Apr 2023 11:51:27 +0530 Subject: [PATCH 6/6] Update Jenkinsfile --- Jenkinsfile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2660e685..f709723b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,13 +32,5 @@ pipeline{ } } - - stage('Deploy to k8s'){ - steps{ - script{ - kubernetesDeploy (configs: 'deploymentservice.yaml',kubeconfigId: 'k8sconfigpwd') - } - } - } } }