From d4135848d0d18e92a89edd4940eca610c82ef4a4 Mon Sep 17 00:00:00 2001 From: abdulsalman13 Date: Mon, 5 Jun 2023 23:32:32 +0400 Subject: [PATCH 1/7] Blue colour --- webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index.html b/webapp/index.html index a683c108..9b23bec5 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ From 0cc25bc91d3a3d25954ce0f188de9e898676fe15 Mon Sep 17 00:00:00 2001 From: abdulsalman13 Date: Mon, 5 Jun 2023 23:32:43 +0400 Subject: [PATCH 2/7] Version 1.1 --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index c7543640..b7bb8fce 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "1.0.1", + "version": "1.1", "type": "module", "scripts": { "dev": "vite", From 17af24f5fdf6f56be611f22d5f85662dbd7aa4a2 Mon Sep 17 00:00:00 2001 From: abdulsalman13 Date: Tue, 6 Jun 2023 00:10:11 +0400 Subject: [PATCH 3/7] version 2.1 --- webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index.html b/webapp/index.html index 9b23bec5..d29c78eb 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ From fc437bb34c72740124fefaf9f650e1ce821fa2ea Mon Sep 17 00:00:00 2001 From: abdulsalman13 Date: Tue, 6 Jun 2023 00:10:27 +0400 Subject: [PATCH 4/7] colour change --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index b7bb8fce..79295401 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "1.1", + "version": "2.1", "type": "module", "scripts": { "dev": "vite", From 3932bac188b943435d5b431cb8f574ce29f2e50a Mon Sep 17 00:00:00 2001 From: salman0610 <134613533+salman0610@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:26:05 +0400 Subject: [PATCH 5/7] Update Jenkinsfile file --- Jenkinsfile | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7594545d..b75cdfe5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,31 +1,43 @@ pipeline { agent any - environment { - // More detail: - // https://jenkins.io/doc/book/pipeline/jenkinsfile/#usernames-and-passwords - NEXUS_CRED = credentials('nexus') - } stages { - stage('Build') { + stage('Test') { steps { - echo 'Building..' - sh 'cd webapp && npm install && npm run build' + echo 'Sonar Analysis' + sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://35.183.142.16/:9000" -e SONAR_LOGIN="sqp_6319576a8565b5f128fc25c3cac0d3ac7cf484af" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } - } - stage('Test') { + } + + stage('Build & Release') { steps { - echo 'Testing..' - sh 'cd webapp && sudo docker container run --rm -e SONAR_HOST_URL="http://20.172.187.108:9000" -e SONAR_LOGIN="sqp_cae41e62e13793ff17d58483fb6fb82602fe2b48" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + script { + def packageJSON = readJSON file: 'webapp/package.json' + def packageJSONVersion = packageJSON.version + sh "echo '${packageJSONVersion}'" + + echo 'Building' + sh 'cd webapp && npm install && npm run build' + + echo 'Releasing' + sh "zip webapp/dist-'${packageJSONVersion}'.zip -r webapp/dist" + sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://35.183.142.16/:8081/repository/lms/" + } } } - stage('Release') { + + stage('Deploy') { steps { - echo 'Release Nexus' - sh 'rm -rf *.zip' - sh 'cd webapp && zip dist-${BUILD_NUMBER}.zip -r dist' - sh 'cd webapp && curl -v -u $Username:$Password --upload-file dist-${BUILD_NUMBER}.zip http://20.172.187.108:8081/repository/lms/' + script { + def packageJSON = readJSON file: 'webapp/package.json' + def packageJSONVersion = packageJSON.version + echo 'Deploying....' + sh "curl -u admin:Admin123 -X GET \'http://35.183.142.16/:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist-'${packageJSONVersion}'.zip" + sh 'sudo rm -rf /var/www/html/*' + sh "sudo unzip -o dist-'${packageJSONVersion}'.zip" + sh "sudo cp -r webapp/dist/* /var/www/html/" + } } } } -} \ No newline at end of file +} From 9d780c4c112b4ac78280706c87748498fcdb46e0 Mon Sep 17 00:00:00 2001 From: salman0610 <134613533+salman0610@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:28:54 +0400 Subject: [PATCH 6/7] Update Jenkinsfile - remove test script --- Jenkinsfile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b75cdfe5..87e2fb33 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,7 @@ pipeline { agent any - stages { - stage('Test') { - steps { - echo 'Sonar Analysis' - sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://35.183.142.16/:9000" -e SONAR_LOGIN="sqp_6319576a8565b5f128fc25c3cac0d3ac7cf484af" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' - } - } - - stage('Build & Release') { + stage('Build & Release') { steps { script { def packageJSON = readJSON file: 'webapp/package.json' From 4179795b98b066e0c2129757621f4b913c874ecb Mon Sep 17 00:00:00 2001 From: salman0610 <134613533+salman0610@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:31:22 +0400 Subject: [PATCH 7/7] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 87e2fb33..2ff6f8c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,7 @@ pipeline { agent any - + + stages { stage('Build & Release') { steps { script {