From ddc7ae8cda8d44118a74db599442ba5ad0070c7b Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 5 May 2023 08:07:05 +0530 Subject: [PATCH 01/88] red color --- webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index.html b/webapp/index.html index 14402119..6c13a5dd 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ From 5c51b311f977b8dd2521d636d69fc80c749c5cb4 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 5 May 2023 08:14:56 +0530 Subject: [PATCH 02/88] green color --- webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index.html b/webapp/index.html index 6c13a5dd..837f88a3 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ From fb60ab8cda302bdc3f0d151b34655db28144e969 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Wed, 17 May 2023 19:41:17 +0530 Subject: [PATCH 03/88] red update --- webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index.html b/webapp/index.html index 837f88a3..6c13a5dd 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ From f6e8b4dd1849fcb1701b025fb5cdeca5c074e679 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 18 May 2023 20:49:08 +0530 Subject: [PATCH 04/88] pipeline template update --- Jenkinsfile | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..f03a56e5 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,29 @@ +pipeline { + agent any + + stages { + stage('Build') { + steps { + echo 'Building..' + } + } + + stage('Test') { + steps { + echo 'Testing..' + } + } + + stage('Release') { + steps { + echo 'Deploying....' + } + } + + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} \ No newline at end of file From 9aa948aaa1c0ba81f10f4e7a76182a3c9771684c Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 18 May 2023 20:52:55 +0530 Subject: [PATCH 05/88] new changes --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f03a56e5..2c3fc934 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,25 +2,25 @@ pipeline { agent any stages { - stage('Build') { + stage('Sonar Analysis') { steps { echo 'Building..' } } - stage('Test') { + stage('Build LMS') { steps { echo 'Testing..' } } - - stage('Release') { + + stage('Release LMS') { steps { echo 'Deploying....' } } - stage('Deploy') { + stage('Deploy LMS') { steps { echo 'Deploying....' } From d6c0b3fc4cdff1f3654c8e45b78ea739938e4e04 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 18 May 2023 20:55:20 +0530 Subject: [PATCH 06/88] sonar analysis --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c3fc934..be00f6dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,8 @@ pipeline { stages { stage('Sonar Analysis') { steps { - echo 'Building..' + echo 'Testing..' + sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } From d6be68790e9de33acf22ddc8a64ad51cddc9bb4c Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 18 May 2023 20:58:24 +0530 Subject: [PATCH 07/88] build artifacts --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index be00f6dc..6e7cd044 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,8 @@ pipeline { stage('Build LMS') { steps { - echo 'Testing..' + echo 'Building Artifacts..' + sh 'cd webapp && npm install && npm run build' } } From 1dba8ff6bd2a6498fc306dda1859749b3358eb28 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 18 May 2023 21:03:58 +0530 Subject: [PATCH 08/88] upload artifacts --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e7cd044..861a15c7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,9 @@ pipeline { stage('Release LMS') { steps { - echo 'Deploying....' + echo 'Store Artifacts....' + sh 'cd webapp && zip dist-1.zip -r dist' + sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-1.zip http://13.92.5.110:8081/repository/lms/' } } From 1b7a42f5526cca9a96fd30821a44f818bf0300b3 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 18 May 2023 21:08:11 +0530 Subject: [PATCH 09/88] deploy app --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 861a15c7..e3b3f11a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,6 +27,9 @@ pipeline { stage('Deploy LMS') { steps { echo 'Deploying....' + sh 'sudo rm -rf /var/www/html/*' + sh 'curl -u admin:Admin123* -X GET 'http://13.92.5.110:8081/repository/lms/dist-1.zip' --output dist.zip' + sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } } } From a5636febcac057bb49c5371143b62a8578c9453b Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 18 May 2023 21:09:20 +0530 Subject: [PATCH 10/88] indent --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e3b3f11a..4531c866 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { steps { echo 'Deploying....' sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET 'http://13.92.5.110:8081/repository/lms/dist-1.zip' --output dist.zip' + sh 'curl -u admin:Admin123* -X GET '"http://13.92.5.110:8081/repository/lms/dist-1.zip"' --output dist.zip' sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } } From 26c322b5711d5cd61f473d15b18272dc3dbf1254 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 18 May 2023 21:12:46 +0530 Subject: [PATCH 11/88] escape character --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4531c866..a8deb0da 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { steps { echo 'Deploying....' sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET '"http://13.92.5.110:8081/repository/lms/dist-1.zip"' --output dist.zip' + sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-1.zip\' --output dist.zip' sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } } From 7955f0c46afaa178ac2f830a0f3f15bc5796f2b2 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 13:24:17 +0530 Subject: [PATCH 12/88] test version number --- Jenkinsfile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a8deb0da..662ff56a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,31 +5,35 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Testing..' - sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + # sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } stage('Build LMS') { steps { echo 'Building Artifacts..' - sh 'cd webapp && npm install && npm run build' + # sh 'cd webapp && npm install && npm run build' } } stage('Release LMS') { steps { + script { + def data = readFile(file: 'webapp/package.json') + println(data) + } echo 'Store Artifacts....' - sh 'cd webapp && zip dist-1.zip -r dist' - sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-1.zip http://13.92.5.110:8081/repository/lms/' + #sh 'cd webapp && zip dist-1.zip -r dist' + #sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-1.zip http://13.92.5.110:8081/repository/lms/' } } stage('Deploy LMS') { steps { echo 'Deploying....' - sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-1.zip\' --output dist.zip' - sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' + #sh 'sudo rm -rf /var/www/html/*' + #sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-1.zip\' --output dist.zip' + #sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } } } From 3bbc01ab2345f446c8517710721c00a9139987c4 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 13:25:29 +0530 Subject: [PATCH 13/88] version --- Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 662ff56a..35107e63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,14 +5,14 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Testing..' - # sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + // sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } stage('Build LMS') { steps { echo 'Building Artifacts..' - # sh 'cd webapp && npm install && npm run build' + // sh 'cd webapp && npm install && npm run build' } } @@ -23,17 +23,17 @@ pipeline { println(data) } echo 'Store Artifacts....' - #sh 'cd webapp && zip dist-1.zip -r dist' - #sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-1.zip http://13.92.5.110:8081/repository/lms/' + //sh 'cd webapp && zip dist-1.zip -r dist' + //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-1.zip http://13.92.5.110:8081/repository/lms/' } } stage('Deploy LMS') { steps { echo 'Deploying....' - #sh 'sudo rm -rf /var/www/html/*' - #sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-1.zip\' --output dist.zip' - #sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' + //sh 'sudo rm -rf /var/www/html/*' + //sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-1.zip\' --output dist.zip' + //sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } } } From af5f1659347ee592734fcd7ec5ac39106ffff774 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 13:33:49 +0530 Subject: [PATCH 14/88] version --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 35107e63..3f902294 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,8 @@ pipeline { steps { script { def data = readFile(file: 'webapp/package.json') - println(data) + //println(data) + println(data.version) } echo 'Store Artifacts....' //sh 'cd webapp && zip dist-1.zip -r dist' From e125311cee3870c4d9bbbe392574825e5b4e8c9f Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 13:38:06 +0530 Subject: [PATCH 15/88] version --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f902294..41c93ba3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { script { def data = readFile(file: 'webapp/package.json') //println(data) - println(data.version) + println(data['version']) } echo 'Store Artifacts....' //sh 'cd webapp && zip dist-1.zip -r dist' From ed077ecf7df6fa308944aba80b9fc1e217d2526e Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 13:47:14 +0530 Subject: [PATCH 16/88] version extract --- Jenkinsfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 41c93ba3..4f2cd4d2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,8 +20,11 @@ pipeline { steps { script { def data = readFile(file: 'webapp/package.json') - //println(data) - println(data['version']) + println(data) + def versionProps = readJSON text: data + echo "Project version is ${versionProps['version']}" + + //println(data['version']) } echo 'Store Artifacts....' //sh 'cd webapp && zip dist-1.zip -r dist' From 4131a93e6b428cf383e3fc17143098ae8ecdcd23 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 13:51:28 +0530 Subject: [PATCH 17/88] version extract --- Jenkinsfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4f2cd4d2..037490de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,12 +19,10 @@ pipeline { stage('Release LMS') { steps { script { - def data = readFile(file: 'webapp/package.json') - println(data) - def versionProps = readJSON text: data - echo "Project version is ${versionProps['version']}" - - //println(data['version']) + def version = sh(returnStdout: true, script: "npm version") + echo "Version is ${version}" + //def data = readFile(file: 'webapp/package.json') + //println(data) } echo 'Store Artifacts....' //sh 'cd webapp && zip dist-1.zip -r dist' From 5ed19695bb7cddc22d9086797ae6df37089b6cc4 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 13:53:58 +0530 Subject: [PATCH 18/88] version --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 037490de..473406b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,8 +19,9 @@ pipeline { stage('Release LMS') { steps { script { - def version = sh(returnStdout: true, script: "npm version") - echo "Version is ${version}" + def packageJSON = readJSON file: 'webapp/package.json' + def packageJSONVersion = packageJSON.version + echo "${packageJSONVersion}" //def data = readFile(file: 'webapp/package.json') //println(data) } From f28bf4c33f638ed578104e9a1b4062913c4ebb58 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:01:45 +0530 Subject: [PATCH 19/88] PL done --- Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 473406b3..ccdcc0ce 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,14 +5,14 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Testing..' - // sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } stage('Build LMS') { steps { echo 'Building Artifacts..' - // sh 'cd webapp && npm install && npm run build' + sh 'cd webapp && npm install && npm run build' } } @@ -26,17 +26,17 @@ pipeline { //println(data) } echo 'Store Artifacts....' - //sh 'cd webapp && zip dist-1.zip -r dist' - //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-1.zip http://13.92.5.110:8081/repository/lms/' + sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' + sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' } } stage('Deploy LMS') { steps { echo 'Deploying....' - //sh 'sudo rm -rf /var/www/html/*' - //sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-1.zip\' --output dist.zip' - //sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' + sh 'sudo rm -rf /var/www/html/*' + sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' + sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } } } From c282ca77c7ec7bf69da7801a601bcb4f8b220e9e Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:02:07 +0530 Subject: [PATCH 20/88] version updated --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index 3986e58f..b7bb8fce 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "0.0.0", + "version": "1.1", "type": "module", "scripts": { "dev": "vite", From 127ac1bf2c3b2aefb003ae8c79d97dfae37b60ab Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:29:44 +0530 Subject: [PATCH 21/88] release --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ccdcc0ce..45b9c7b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,10 +24,11 @@ pipeline { echo "${packageJSONVersion}" //def data = readFile(file: 'webapp/package.json') //println(data) - } echo 'Store Artifacts....' sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' + } + } } From ee1d2a99788a2a15be9a93dbb650f8f0cc196106 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:33:44 +0530 Subject: [PATCH 22/88] test --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 45b9c7b9..bc4c0a75 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,14 +5,14 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Testing..' - sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + //sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } stage('Build LMS') { steps { echo 'Building Artifacts..' - sh 'cd webapp && npm install && npm run build' + //sh 'cd webapp && npm install && npm run build' } } @@ -25,8 +25,8 @@ pipeline { //def data = readFile(file: 'webapp/package.json') //println(data) echo 'Store Artifacts....' - sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' - sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' + sh 'cd webapp && zip dist-'${packageJSONVersion}'.zip -r dist' + //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' } } From 4a189b160f0b03617a5b851e88e9d8215a2cc427 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:42:06 +0530 Subject: [PATCH 23/88] test --- Jenkinsfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bc4c0a75..af459934 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,19 @@ pipeline { agent any + environment { + //Use Pipeline Utility Steps plugin to read information from pom.xml into env variables + // IMAGE = readMavenPom().getArtifactId() + // VERSION = readMavenPom().getVersion() + //Use Pipeline Utility Steps plugin to read information from package.json into env variables + packageJSON = readJSON file: 'webapp/package.json' + packageJSONVersion = packageJSON.version + } stages { stage('Sonar Analysis') { steps { echo 'Testing..' + echo "${packageJSONVersion}" //sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } @@ -25,7 +34,7 @@ pipeline { //def data = readFile(file: 'webapp/package.json') //println(data) echo 'Store Artifacts....' - sh 'cd webapp && zip dist-'${packageJSONVersion}'.zip -r dist' + //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' } @@ -35,9 +44,9 @@ pipeline { stage('Deploy LMS') { steps { echo 'Deploying....' - sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' - sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' + //sh 'sudo rm -rf /var/www/html/*' + //sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' + //sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } } } From 97769cd6e2494d5271039821268e20e1b6e960bc Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:43:03 +0530 Subject: [PATCH 24/88] test --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index af459934..2667d9ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,8 +6,8 @@ pipeline { // VERSION = readMavenPom().getVersion() //Use Pipeline Utility Steps plugin to read information from package.json into env variables - packageJSON = readJSON file: 'webapp/package.json' - packageJSONVersion = packageJSON.version + def packageJSON = readJSON file: 'webapp/package.json' + def packageJSONVersion = packageJSON.version } stages { stage('Sonar Analysis') { From 4790ed5a38277e201fb1c4db5426a6159ea0ec63 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:46:00 +0530 Subject: [PATCH 25/88] test --- Jenkinsfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2667d9ea..8f511ab8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,11 +4,19 @@ pipeline { //Use Pipeline Utility Steps plugin to read information from pom.xml into env variables // IMAGE = readMavenPom().getArtifactId() // VERSION = readMavenPom().getVersion() - - //Use Pipeline Utility Steps plugin to read information from package.json into env variables - def packageJSON = readJSON file: 'webapp/package.json' - def packageJSONVersion = packageJSON.version } + + script { + def packageJSON = readJSON file: 'webapp/package.json' + def packageJSONVersion = packageJSON.version + echo "${packageJSONVersion}" + //def data = readFile(file: 'webapp/package.json') + //println(data) + echo 'Store Artifacts....' + //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' + //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' + } + stages { stage('Sonar Analysis') { steps { From 022aea70157c35e5088d583ec45a69972e9773c4 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:47:38 +0530 Subject: [PATCH 26/88] test --- Jenkinsfile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f511ab8..14a81c3b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,17 +6,6 @@ pipeline { // VERSION = readMavenPom().getVersion() } - script { - def packageJSON = readJSON file: 'webapp/package.json' - def packageJSONVersion = packageJSON.version - echo "${packageJSONVersion}" - //def data = readFile(file: 'webapp/package.json') - //println(data) - echo 'Store Artifacts....' - //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' - //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' - } - stages { stage('Sonar Analysis') { steps { From ddeb8d8b9c4e2c278954cbd51dcf1f08cd6bf185 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:48:21 +0530 Subject: [PATCH 27/88] test --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 14a81c3b..49a587a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,10 @@ pipeline { agent any - environment { + //environment { //Use Pipeline Utility Steps plugin to read information from pom.xml into env variables // IMAGE = readMavenPom().getArtifactId() // VERSION = readMavenPom().getVersion() - } + //} stages { stage('Sonar Analysis') { From dcf6acafe196f1b1723cadd3cc8c2fe57e90f8e9 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:49:19 +0530 Subject: [PATCH 28/88] test --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 49a587a2..bb54be20 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,6 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Testing..' - echo "${packageJSONVersion}" //sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } From 2ce55348db012279289ce91e4036d16f7941e283 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 14:53:16 +0530 Subject: [PATCH 29/88] test --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bb54be20..036dec28 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,9 @@ pipeline { script { def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version - echo "${packageJSONVersion}" + echo "${packageJSONVersion}" + sh 'zip dist-${packageJSONVersion}.zip -r webapp/dist' + sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') //println(data) echo 'Store Artifacts....' From 0cb676f40ce3268b0bbb77114dca85018e3cef1e Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:03:53 +0530 Subject: [PATCH 30/88] test --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 036dec28..cb393a40 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,8 +27,8 @@ pipeline { def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version echo "${packageJSONVersion}" - sh 'zip dist-${packageJSONVersion}.zip -r webapp/dist' - sh 'ls webapp' + sh 'zip dist-\"${packageJSONVersion}.zip\" -r webapp/dist' + sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') //println(data) echo 'Store Artifacts....' From 408e6053e23011dfba2a4a2674c05b3772803985 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:05:21 +0530 Subject: [PATCH 31/88] test --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index cb393a40..c0545439 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,6 +27,7 @@ pipeline { def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version echo "${packageJSONVersion}" + sh 'echo ${packageJSONVersion}' sh 'zip dist-\"${packageJSONVersion}.zip\" -r webapp/dist' sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') From 765eae90153c4ac61ab314f0d67482adda40fef3 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:06:28 +0530 Subject: [PATCH 32/88] test --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c0545439..db32b168 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,6 +27,8 @@ pipeline { def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version echo "${packageJSONVersion}" + zip dist-${packageJSONVersion}.zip -r webapp/dist + sh 'echo ${packageJSONVersion}' sh 'zip dist-\"${packageJSONVersion}.zip\" -r webapp/dist' sh 'ls webapp' From 715692d10e45acc195a0c072c6a20ac95be87abb Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:12:52 +0530 Subject: [PATCH 33/88] tt --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index db32b168..49227fef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,6 @@ pipeline { def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version echo "${packageJSONVersion}" - zip dist-${packageJSONVersion}.zip -r webapp/dist sh 'echo ${packageJSONVersion}' sh 'zip dist-\"${packageJSONVersion}.zip\" -r webapp/dist' From 5015b0084dc5bb6f9dfc423c2530ae6b6a390237 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:15:53 +0530 Subject: [PATCH 34/88] tt --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 49227fef..ee96eb4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { def packageJSONVersion = packageJSON.version echo "${packageJSONVersion}" - sh 'echo ${packageJSONVersion}' + sh "echo '${packageJSONVersion}'" sh 'zip dist-\"${packageJSONVersion}.zip\" -r webapp/dist' sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') From feb4b3425242fb55813d5c80cb10184741c31f1b Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:20:20 +0530 Subject: [PATCH 35/88] test version --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee96eb4c..b8335718 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { echo "${packageJSONVersion}" sh "echo '${packageJSONVersion}'" - sh 'zip dist-\"${packageJSONVersion}.zip\" -r webapp/dist' + sh "zip dist-'${packageJSONVersion}'.zip -r webapp/dist" sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') //println(data) From 05fbe817b543a89a05b1466e6c2d3457e5e2e52c Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:31:02 +0530 Subject: [PATCH 36/88] test upload --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index b8335718..210345a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,6 +30,7 @@ pipeline { sh "echo '${packageJSONVersion}'" sh "zip dist-'${packageJSONVersion}'.zip -r webapp/dist" + sh "cd webapp && curl -v -u admin:Admin123* --upload-file '${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') //println(data) From 58b2bea908b972ea9e4c6bcf031e6400feda8bc8 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:33:00 +0530 Subject: [PATCH 37/88] test upload --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 210345a2..ceacd8d8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { sh "echo '${packageJSONVersion}'" sh "zip dist-'${packageJSONVersion}'.zip -r webapp/dist" - sh "cd webapp && curl -v -u admin:Admin123* --upload-file '${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" + sh "cd webapp && curl -v -u admin:Admin123* --upload-file dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') //println(data) From 8f0aef51e11a9eea07d633e6c253023d4e5fb03d Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:34:22 +0530 Subject: [PATCH 38/88] test upload --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ceacd8d8..f3dfce2f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { sh "echo '${packageJSONVersion}'" sh "zip dist-'${packageJSONVersion}'.zip -r webapp/dist" - sh "cd webapp && curl -v -u admin:Admin123* --upload-file dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" + sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') //println(data) From 61128cefaae5d5b9c6f8d18065889db631eb3656 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:37:11 +0530 Subject: [PATCH 39/88] test --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index f3dfce2f..340a980f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,6 +30,7 @@ pipeline { sh "echo '${packageJSONVersion}'" sh "zip dist-'${packageJSONVersion}'.zip -r webapp/dist" + sh "ls webapp" sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" sh 'ls webapp' //def data = readFile(file: 'webapp/package.json') From 082131021ae18b72999e16d29e3547622a405d1b Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:39:30 +0530 Subject: [PATCH 40/88] test zip --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 340a980f..5f381835 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,6 +29,7 @@ pipeline { echo "${packageJSONVersion}" sh "echo '${packageJSONVersion}'" + sh 'sudo rm -rf *.zip' sh "zip dist-'${packageJSONVersion}'.zip -r webapp/dist" sh "ls webapp" sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" From 36e75580d9bb4fc139a2e11e73c5950843860cc5 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:41:20 +0530 Subject: [PATCH 41/88] delete temp zip files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5f381835..c8b27453 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { echo "${packageJSONVersion}" sh "echo '${packageJSONVersion}'" - sh 'sudo rm -rf *.zip' + sh 'sudo rm -rf webapp/*.zip' sh "zip dist-'${packageJSONVersion}'.zip -r webapp/dist" sh "ls webapp" sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" From 9b028ee49c65ea4a496ca48ba014778410b87d7d Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:42:52 +0530 Subject: [PATCH 42/88] update zip file --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8b27453..c9b6cfdd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { sh "echo '${packageJSONVersion}'" sh 'sudo rm -rf webapp/*.zip' - sh "zip dist-'${packageJSONVersion}'.zip -r webapp/dist" + sh "zip webapp/dist-'${packageJSONVersion}'.zip -r webapp/dist" sh "ls webapp" sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" sh 'ls webapp' From 374f300b1ee64ab577c216ed80128aa1e2c864e2 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:50:20 +0530 Subject: [PATCH 43/88] test --- Jenkinsfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c9b6cfdd..ac4addde 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { stage('Build LMS') { steps { echo 'Building Artifacts..' - //sh 'cd webapp && npm install && npm run build' + sh 'cd webapp && npm install && npm run build' } } @@ -27,26 +27,23 @@ pipeline { def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version echo "${packageJSONVersion}" - - sh "echo '${packageJSONVersion}'" + echo 'Store Artifacts....' + // sh "echo '${packageJSONVersion}'" sh 'sudo rm -rf webapp/*.zip' sh "zip webapp/dist-'${packageJSONVersion}'.zip -r webapp/dist" - sh "ls webapp" - sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" - sh 'ls webapp' + sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" //def data = readFile(file: 'webapp/package.json') //println(data) - echo 'Store Artifacts....' //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' - } - + } } } stage('Deploy LMS') { steps { echo 'Deploying....' + sh "echo '${packageJSONVersion}'" //sh 'sudo rm -rf /var/www/html/*' //sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' //sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' From 21bfc139a8980e4731bcd2ea9c00a8f4dc2427c6 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:56:07 +0530 Subject: [PATCH 44/88] test deploy --- Jenkinsfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ac4addde..26697685 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,10 +43,19 @@ pipeline { stage('Deploy LMS') { steps { echo 'Deploying....' - sh "echo '${packageJSONVersion}'" - //sh 'sudo rm -rf /var/www/html/*' - //sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' - //sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' + script { + def packageJSON = readJSON file: 'webapp/package.json' + def packageJSONVersion = packageJSON.version + echo "${packageJSONVersion}" + sh "zip webapp/dist-'${packageJSONVersion}'.zip -r webapp/dist" + sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" + //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' + //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' + sh 'sudo rm -rf /var/www/html/*' + sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-'${packageJSONVersion}'.zip\' --output dist.zip' + sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' + } + } } } From c42bc43bdbd1e95a75de1cd7f6db2e870fc1b42b Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 15:59:27 +0530 Subject: [PATCH 45/88] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 26697685..5d6b74e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,7 @@ pipeline { //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-'${packageJSONVersion}'.zip\' --output dist.zip' + sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-'"${packageJSONVersion}"'.zip\' --output dist.zip' sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } From 034223a03c5fdd1adea0b1e552937d8d62725164 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:01:24 +0530 Subject: [PATCH 46/88] upload --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5d6b74e1..4ae45a45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,7 @@ pipeline { //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-'"${packageJSONVersion}"'.zip\' --output dist.zip' + sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } From 623a65d8fc4b72d387b074a0053215843401f421 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:06:48 +0530 Subject: [PATCH 47/88] test --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4ae45a45..94f29be8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,6 +52,7 @@ pipeline { //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' sh 'sudo rm -rf /var/www/html/*' + sh 'ls' sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } From 53531d6c53b8cfc62a6278d5bc9387f2d303df7f Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:08:10 +0530 Subject: [PATCH 48/88] test --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 94f29be8..dcacff04 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,13 +47,11 @@ pipeline { def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version echo "${packageJSONVersion}" - sh "zip webapp/dist-'${packageJSONVersion}'.zip -r webapp/dist" - sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' sh 'sudo rm -rf /var/www/html/*' - sh 'ls' sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' + sh 'ls' sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' } From a4f89cd8b4aa950baf1126f6349bd4f901bce078 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:10:26 +0530 Subject: [PATCH 49/88] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dcacff04..ed15d480 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,7 @@ pipeline { sh 'sudo rm -rf /var/www/html/*' sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' sh 'ls' - sh 'unzip dist.zip && sudo cp -r dist/* /var/www/html/' + sh 'unzip dist-${packageJSONVersion}.zip && sudo cp -r dist/* /var/www/html/' } } From c5ae86db3bdaaaf4af37232a30f5ce0ed9095f75 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:13:11 +0530 Subject: [PATCH 50/88] nginx deploy --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ed15d480..c40d8179 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,9 +52,8 @@ pipeline { sh 'sudo rm -rf /var/www/html/*' sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' sh 'ls' - sh 'unzip dist-${packageJSONVersion}.zip && sudo cp -r dist/* /var/www/html/' - } - + sh "unzip dist-'${packageJSONVersion}'.zip && sudo cp -r dist/* /var/www/html/" + } } } } From 615c5eb91cc68bc453297542a865bef353674284 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:15:44 +0530 Subject: [PATCH 51/88] deploy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c40d8179..bafc7afe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,7 @@ pipeline { //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' sh 'sudo rm -rf /var/www/html/*' sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' - sh 'ls' + sh 'sudo rm -rf dist' sh "unzip dist-'${packageJSONVersion}'.zip && sudo cp -r dist/* /var/www/html/" } } From befb0bf2278e1ce5d08f9119aa479af6808162b7 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:19:18 +0530 Subject: [PATCH 52/88] deploy nginx --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bafc7afe..47c65945 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,7 @@ pipeline { sh 'sudo rm -rf /var/www/html/*' sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' sh 'sudo rm -rf dist' - sh "unzip dist-'${packageJSONVersion}'.zip && sudo cp -r dist/* /var/www/html/" + sh "sudo unzip dist-'${packageJSONVersion}'.zip -d /var/www/html/" } } } From 190b56e2076cbc19c6cb9f346b6e82e940fe1d67 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:23:00 +0530 Subject: [PATCH 53/88] nginx --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 47c65945..b19a7da6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,8 @@ pipeline { sh 'sudo rm -rf /var/www/html/*' sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' sh 'sudo rm -rf dist' - sh "sudo unzip dist-'${packageJSONVersion}'.zip -d /var/www/html/" + sh "sudo unzip dist-'${packageJSONVersion}'.zip" + sh "sudo cp -r dist/* /var/www/html/" } } } From 6d3242e1e671520b8e6307c45c59fd7c68dd8c7c Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:26:24 +0530 Subject: [PATCH 54/88] force update --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b19a7da6..1134e979 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,7 @@ pipeline { sh 'sudo rm -rf /var/www/html/*' sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' sh 'sudo rm -rf dist' - sh "sudo unzip dist-'${packageJSONVersion}'.zip" + sh "sudo unzip -o dist-'${packageJSONVersion}'.zip" sh "sudo cp -r dist/* /var/www/html/" } } From 567d9f1f13f0cabdb898fe97045d3a2067a5c0f3 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:27:43 +0530 Subject: [PATCH 55/88] update --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1134e979..db8b0fb1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ pipeline { sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' sh 'sudo rm -rf dist' sh "sudo unzip -o dist-'${packageJSONVersion}'.zip" - sh "sudo cp -r dist/* /var/www/html/" + sh "sudo cp -r webapp/dist/* /var/www/html/" } } } From 72389b94cc4207cc09270b134990033ff913402a Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:29:12 +0530 Subject: [PATCH 56/88] green --- webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/index.html b/webapp/index.html index 6c13a5dd..837f88a3 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ From e4815f6391949763251513c3128ac48303b72de9 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:31:14 +0530 Subject: [PATCH 57/88] yellow update --- webapp/index.html | 2 +- webapp/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/index.html b/webapp/index.html index 837f88a3..6297d000 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ 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 18f96cc886b4d4140b9b665944a51afe790ea49b Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:33:40 +0530 Subject: [PATCH 58/88] upgrade --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index db8b0fb1..0e9916e9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,7 +50,7 @@ pipeline { //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist.zip' + sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist-${packageJSONVersion}.zip' sh 'sudo rm -rf dist' sh "sudo unzip -o dist-'${packageJSONVersion}'.zip" sh "sudo cp -r webapp/dist/* /var/www/html/" From bdcedd5e3e2da3b9456ca6f50d74a333375e35c9 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:33:54 +0530 Subject: [PATCH 59/88] vs --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index 79295401..0e1e6172 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "2.1", + "version": "3.1", "type": "module", "scripts": { "dev": "vite", From 5115ce84b69d3203a0f220162c48ca7155e5097d Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:35:14 +0530 Subject: [PATCH 60/88] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e9916e9..1082f35f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,7 +50,7 @@ pipeline { //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist-${packageJSONVersion}.zip' + sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist-'${packageJSONVersion}'.zip' sh 'sudo rm -rf dist' sh "sudo unzip -o dist-'${packageJSONVersion}'.zip" sh "sudo cp -r webapp/dist/* /var/www/html/" From c8c776ce34a20a7a08d708dfdd7125e5e5622565 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 19 May 2023 16:35:28 +0530 Subject: [PATCH 61/88] up --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index 0e1e6172..3bc09ad0 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "3.1", + "version": "4.1", "type": "module", "scripts": { "dev": "vite", From 9ffe1d2a541173d850d9688ef9a92b5cdc64576e Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Wed, 31 May 2023 13:43:52 +0000 Subject: [PATCH 62/88] red color --- webapp/index.html | 4 ++-- webapp/package-lock.json | 4 ++-- webapp/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/index.html b/webapp/index.html index 6297d000..84e96c57 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/webapp/package-lock.json b/webapp/package-lock.json index b104c910..a2e00270 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -1,12 +1,12 @@ { "name": "webapp", - "version": "0.0.0", + "version": "1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "webapp", - "version": "0.0.0", + "version": "1.1", "dependencies": { "@headlessui/react": "^1.7.3", "@mantine/hooks": "^5.4.0", diff --git a/webapp/package.json b/webapp/package.json index 3bc09ad0..b7bb8fce 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "4.1", + "version": "1.1", "type": "module", "scripts": { "dev": "vite", From 38f4853e311ad22496581d7a43417e34a122553c Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Wed, 31 May 2023 14:22:19 +0000 Subject: [PATCH 63/88] green version --- webapp/index.html | 2 +- webapp/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/index.html b/webapp/index.html index 84e96c57..a683c108 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ 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 633653be9ca004d21b0a9a5ca2e33d0cb6120aeb Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 2 Jun 2023 18:36:16 +0530 Subject: [PATCH 64/88] my 3rd commit --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index 79295401..0e1e6172 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "2.1", + "version": "3.1", "type": "module", "scripts": { "dev": "vite", From 8e391b81e97efcbcf30a6815f198212805a2093a Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 2 Jun 2023 18:49:49 +0530 Subject: [PATCH 65/88] added 4th --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/package.json b/webapp/package.json index 0e1e6172..3bc09ad0 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "3.1", + "version": "4.1", "type": "module", "scripts": { "dev": "vite", From 3cd77e01b95e9fef85e76a4c36579bd863b8250e Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 5 Jun 2023 19:42:35 +0530 Subject: [PATCH 66/88] version 1.1-for red color --- webapp/index.html | 2 +- webapp/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/index.html b/webapp/index.html index a683c108..84e96c57 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ diff --git a/webapp/package.json b/webapp/package.json index 3bc09ad0..b7bb8fce 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "4.1", + "version": "1.1", "type": "module", "scripts": { "dev": "vite", From 42aa9a57a8dd45e56b50f565fff4662afe0d7e78 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 5 Jun 2023 20:14:01 +0530 Subject: [PATCH 67/88] version -2.1-green --- webapp/index.html | 2 +- webapp/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/index.html b/webapp/index.html index 84e96c57..a683c108 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ 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 e732b0aff535ed4189d8523d85b2618891f211ce Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 5 Jun 2023 20:42:45 +0530 Subject: [PATCH 68/88] v4.1-yellow version --- webapp/index.html | 2 +- webapp/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/index.html b/webapp/index.html index a683c108..5ae3d2d7 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ diff --git a/webapp/package.json b/webapp/package.json index 79295401..3bc09ad0 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "2.1", + "version": "4.1", "type": "module", "scripts": { "dev": "vite", From 73151b5a2f30ddadac66f04922ac3c038ec37315 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 5 Jun 2023 20:47:29 +0530 Subject: [PATCH 69/88] v5.1 red version --- webapp/index.html | 2 +- webapp/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/index.html b/webapp/index.html index 5ae3d2d7..84e96c57 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ diff --git a/webapp/package.json b/webapp/package.json index 3bc09ad0..491d9151 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "4.1", + "version": "5.1", "type": "module", "scripts": { "dev": "vite", From 7f47e1954058b1a0a66623b1dee02a46dc968a98 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 17:40:54 +0530 Subject: [PATCH 70/88] create pipeline lms --- Jenkinsfile | 36 ++++++++---------------------------- webapp/package.json | 2 +- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1082f35f..6765e103 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,35 +7,24 @@ pipeline { //} stages { - stage('Sonar Analysis') { - steps { + stage('Sonar Analysis') + { + steps + { echo 'Testing..' - //sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://13.92.5.110:9000" -e SONAR_LOGIN="sqp_cab9202255bd4cf50f3dbba65bb5aaef79ed00fa" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + } } stage('Build LMS') { steps { - echo 'Building Artifacts..' - sh 'cd webapp && npm install && npm run build' - } + } stage('Release LMS') { steps { script { - def packageJSON = readJSON file: 'webapp/package.json' - def packageJSONVersion = packageJSON.version - echo "${packageJSONVersion}" - echo 'Store Artifacts....' - // sh "echo '${packageJSONVersion}'" - sh 'sudo rm -rf webapp/*.zip' - sh "zip webapp/dist-'${packageJSONVersion}'.zip -r webapp/dist" - sh "curl -v -u admin:Admin123* --upload-file webapp/dist-'${packageJSONVersion}'.zip http://13.92.5.110:8081/repository/lms/" - //def data = readFile(file: 'webapp/package.json') - //println(data) - //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' - //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' + } } } @@ -44,16 +33,7 @@ pipeline { steps { echo 'Deploying....' script { - def packageJSON = readJSON file: 'webapp/package.json' - def packageJSONVersion = packageJSON.version - echo "${packageJSONVersion}" - //sh 'cd webapp && zip dist-${packageJSONVersion}.zip -r dist' - //sh 'cd webapp && curl -v -u admin:Admin123* --upload-file dist-${packageJSONVersion}.zip http://13.92.5.110:8081/repository/lms/' - sh 'sudo rm -rf /var/www/html/*' - sh 'curl -u admin:Admin123* -X GET \'http://13.92.5.110:8081/repository/lms/dist-${packageJSONVersion}.zip\' --output dist-'${packageJSONVersion}'.zip' - sh 'sudo rm -rf dist' - sh "sudo unzip -o dist-'${packageJSONVersion}'.zip" - sh "sudo cp -r webapp/dist/* /var/www/html/" + } } } diff --git a/webapp/package.json b/webapp/package.json index 491d9151..b7bb8fce 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,7 +1,7 @@ { "name": "webapp", "private": true, - "version": "5.1", + "version": "1.1", "type": "module", "scripts": { "dev": "vite", From 9c22ae2e4e4503771441f998b86cbaaf0eff52e0 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 17:48:59 +0530 Subject: [PATCH 71/88] delete jenkins file --- Jenkinsfile | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 6765e103..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,41 +0,0 @@ -pipeline { - agent any - //environment { - //Use Pipeline Utility Steps plugin to read information from pom.xml into env variables - // IMAGE = readMavenPom().getArtifactId() - // VERSION = readMavenPom().getVersion() - //} - - stages { - stage('Sonar Analysis') - { - steps - { - echo 'Testing..' - - } - } - - stage('Build LMS') { - steps { - - } - - stage('Release LMS') { - steps { - script { - - } - } - } - - stage('Deploy LMS') { - steps { - echo 'Deploying....' - script { - - } - } - } - } -} \ No newline at end of file From cd4fc12ac9866b8a5c7fe8d99a3e824eec022067 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 17:58:56 +0530 Subject: [PATCH 72/88] jenkins file aadd --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..74e8d573 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent any + + + stages { + stage('Sonar Analysis') + { + steps + { + echo 'Testing..' + + } + } + } +} \ No newline at end of file From 1a3b54a249aebc0e3d9d6d18a0d57eaafb667c91 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 18:16:17 +0530 Subject: [PATCH 73/88] New jenkins file updated --- Jenkinsfile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 74e8d573..476b3c7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,14 +1,20 @@ pipeline { agent any - stages { - stage('Sonar Analysis') - { - steps - { + stage('Build') { + steps { + echo 'Building..' + } + } + stage('Test') { + steps { echo 'Testing..' - + } + } + stage('Deploy') { + steps { + echo 'Deploying....' } } } From 51edcbe81adc4eedac7f33dc194006966c5d238b Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 18:28:57 +0530 Subject: [PATCH 74/88] release struructre pipeline --- Jenkinsfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 476b3c7c..32ada933 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,16 +2,19 @@ pipeline { agent any stages { - stage('Build') { + + stage('Sonar Analysis') { steps { - echo 'Building..' + echo 'Testing..' + } } - stage('Test') { + stage('Build') { steps { - echo 'Testing..' + echo 'Building..' } } + stage('Deploy') { steps { echo 'Deploying....' From 06de04c161ef0b7deb35f8bf9d15e4e84ba9c9e3 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 18:34:49 +0530 Subject: [PATCH 75/88] sonarqube installation --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 32ada933..e2e170b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Testing..' - + sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms } } stage('Build') { From 4f2921702b001aa60198004a95fc0af1b795ea13 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 18:52:56 +0530 Subject: [PATCH 76/88] sonarqube file ext added --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2e170b4..dd93de54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Testing..' - sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms + sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } stage('Build') { From f85bcf59a0030c8cc38a31b44fc879e6fb4e9c52 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 19:05:54 +0530 Subject: [PATCH 77/88] building a lms application --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dd93de54..aca409d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,9 +9,10 @@ pipeline { sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } - stage('Build') { + stage('Build Lms') { steps { - echo 'Building..' + echo 'Building Artifects..' + sh 'cd webapp && npm install && npm run build' } } From bfa2b3fcc1c725e0798a83c609a7599b77457193 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 19:12:36 +0530 Subject: [PATCH 78/88] upload file in nexus --- Jenkinsfile | 12 ++++++++++-- webapp/index.html | 2 +- webapp/package.json | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aca409d7..d32c2d74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,9 +16,17 @@ pipeline { } } - stage('Deploy') { + stage('Releaseing') { steps { - echo 'Deploying....' + echo 'Releasing application to nexus...' + def packageJSON = readJSON file: 'webapp/package.json' + def packageJSONVersion = packageJSON.version + echo "${packageJSONVersion}" + echo 'Store Artifacts....' + // sh "echo '${packageJSONVersion}'" + sh 'sudo rm -rf webapp/*.zip' + sh "zip webapp/dist-'${packageJSONVersion}'.zip -r webapp/dist" + sh "curl -v -u admin:shree --upload-file webapp/dist-'${packageJSONVersion}'.zip http://52.66.12.85:8081/repository/lms/" } } } diff --git a/webapp/index.html b/webapp/index.html index 84e96c57..a683c108 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,7 +9,7 @@ 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 f4a96c4dd4ed0aa20421a08df46a8dc8395dc194 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 19:14:51 +0530 Subject: [PATCH 79/88] scripts issue for nexus --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index d32c2d74..0a4edea7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,6 +18,7 @@ pipeline { stage('Releaseing') { steps { + script{ echo 'Releasing application to nexus...' def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version From a411e248c7390c685792315c867838c5ab00b1c3 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Fri, 9 Jun 2023 19:16:14 +0530 Subject: [PATCH 80/88] scripts updated --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0a4edea7..e844dfb8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,9 +16,12 @@ pipeline { } } - stage('Releaseing') { + stage('Releaseing') + { + steps { - script{ + script + { echo 'Releasing application to nexus...' def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version @@ -28,6 +31,7 @@ pipeline { sh 'sudo rm -rf webapp/*.zip' sh "zip webapp/dist-'${packageJSONVersion}'.zip -r webapp/dist" sh "curl -v -u admin:shree --upload-file webapp/dist-'${packageJSONVersion}'.zip http://52.66.12.85:8081/repository/lms/" + } } } } From 9e844f6d00948dd51b5866d2798e330d5ffde810 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 12 Jun 2023 17:16:54 +0530 Subject: [PATCH 81/88] repository added --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e844dfb8..b27895f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,6 +23,7 @@ pipeline { script { echo 'Releasing application to nexus...' + echo 'repeat' def packageJSON = readJSON file: 'webapp/package.json' def packageJSONVersion = packageJSON.version echo "${packageJSONVersion}" From 92545fff1cedc401f9038418c31b7d9802ca265f Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 12 Jun 2023 18:41:20 +0530 Subject: [PATCH 82/88] deploying code --- Jenkinsfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index b27895f1..6ccab32f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,5 +35,18 @@ pipeline { } } } + stage('Deploy LMS') { + steps { + script { + echo "Deploying.." + def packageJSON = readJSON file: 'webapp/package.json' + def packageJSONVersion = packageJSON.version + echo "${packageJSONVersion}" + sh "curl -u admin:shree -X GET \'http://52.66.12.85: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 659dba34e83eceac6f2fb47c0f2a1985a174ca59 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 12 Jun 2023 18:44:19 +0530 Subject: [PATCH 83/88] adding bracket to pipeline --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 6ccab32f..0593797d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,7 +46,9 @@ pipeline { 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 37765bdb6e03f4cf4b97b2498a7c3868da34e5cb Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 12 Jun 2023 19:10:58 +0530 Subject: [PATCH 84/88] add mkdir comment --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 0593797d..1cafacb9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,6 +45,7 @@ pipeline { sh "curl -u admin:shree -X GET \'http://52.66.12.85: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 mkdir /var/www/html" sh "sudo cp -r webapp/dist/* /var/www/html" } } From 9e532987b3f1b25a99e249ca84a2924289afc907 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 12 Jun 2023 19:39:43 +0530 Subject: [PATCH 85/88] commenting sonarqube code --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1cafacb9..b63ec9bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,11 +3,11 @@ pipeline { stages { - stage('Sonar Analysis') { - steps { - echo 'Testing..' - sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' - } + // stage('Sonar Analysis') { + // steps { + // echo 'Testing..' + // sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + // } } stage('Build Lms') { steps { From 5439c4058c3607a292cbd7f6ef01251ac3681ad7 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 12 Jun 2023 19:43:23 +0530 Subject: [PATCH 86/88] bracket change --- Jenkinsfile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b63ec9bb..99567303 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,14 +3,18 @@ pipeline { stages { - // stage('Sonar Analysis') { - // steps { - // echo 'Testing..' - // sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' - // } - } - stage('Build Lms') { - steps { + // stage('Sonar Analysis') + { + // steps + //{ + // echo 'Testing..' + // sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + //} + //} + stage('Build Lms') + { + steps + { echo 'Building Artifects..' sh 'cd webapp && npm install && npm run build' } From 6c0e041705d1306688cc00a742c5d9d997af7393 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 12 Jun 2023 19:45:04 +0530 Subject: [PATCH 87/88] bracess --- Jenkinsfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 99567303..08e13803 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,16 +1,17 @@ pipeline { agent any - stages { + stages + { - // stage('Sonar Analysis') + stage('Sonar Analysis') { - // steps - //{ + steps + { // echo 'Testing..' // sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' - //} - //} + } + } stage('Build Lms') { steps From ad5de0f85a9275e1333ee518917173f05d0dcd73 Mon Sep 17 00:00:00 2001 From: Mangeshqa13 Date: Mon, 12 Jun 2023 19:47:45 +0530 Subject: [PATCH 88/88] bracess add --- Jenkinsfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08e13803..8d2cd2eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,16 @@ -pipeline { +pipeline +{ agent any stages { - stage('Sonar Analysis') + stage('Sonar Analysis') { - steps + steps { - // echo 'Testing..' - // sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' + echo 'Testing..' + // sh 'cd webapp && sudo docker run --rm -e SONAR_HOST_URL="http://52.66.12.85:9000/" -e SONAR_LOGIN="sqp_d0d19b20d68a420ea2a1f873f756dfa0bf4493c1" -v ".:/usr/src" sonarsource/sonar-scanner-cli -Dsonar.projectKey=lms' } } stage('Build Lms')