From ca4a8fb28df5afb5665acf6f7656888af3587e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 11:39:13 +0100 Subject: [PATCH 1/8] Add Jenkinsfile for frontend --- FrontEnd/Jenkinsfile | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 FrontEnd/Jenkinsfile diff --git a/FrontEnd/Jenkinsfile b/FrontEnd/Jenkinsfile new file mode 100644 index 0000000..8dc1525 --- /dev/null +++ b/FrontEnd/Jenkinsfile @@ -0,0 +1,45 @@ +pipeline { + agent any + tools { + nodejs 'localNode' + } + + stages { + stage('Initialize') { + steps { + echo 'Initialize...' + sh ''' + echo "PATH = ${PATH}" + ''' + } + } + stage('Install dependencies') { + steps { + echo 'Install dependencies...' + sh ''' + cd FrontEnd + npm install -g @angular/cli@1.7.4; + npm install + ''' + } + } + stage('Build') { + steps { + echo 'Building...' + sh ''' + ng build --prod + ''' + } + } + stage('Test') { + steps { + echo 'Testing...' + } + } + stage('Deploy') { + steps { + echo 'Deploying...' + } + } + } +} \ No newline at end of file From 4457bb2d1e7d3a9cc269625a67c48532f11629e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 11:43:36 +0100 Subject: [PATCH 2/8] New Jenkinsfile --- Jenkinsfile | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..d4b1bde --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,56 @@ +pipeline { + agent any + tools { + maven 'Default' + jdk 'java-11-openjdk-amd64' + nodejs 'localNode' + } + + stages { + stage('Initialize') { + steps { + sh ''' + echo "PATH = ${PATH}" + echo "M2_HOME = ${M2_HOME}" + ''' + } + } + stage('Build') { + steps { + echo 'Building..' + sh ''' + cd BackEnd + mvn clean install -Dmaven.test.skip=true + sh ''' + } + } + stage('Install dependencies') { + steps { + echo 'Install dependencies...' + sh ''' + cd FrontEnd + npm install -g @angular/cli@1.7.4; + npm install + ''' + } + } + stage('Build FrontEnd') { + steps { + echo 'Building...' + sh ''' + ng build --prod + ''' + } + } + stage('Test') { + steps { + echo 'Testing..' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} \ No newline at end of file From 1d01f427f26c383f08c9a9b794949116b45260ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:06:12 +0100 Subject: [PATCH 3/8] Update Jenkinsfile --- Jenkinsfile | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d4b1bde..c77163f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,6 +7,20 @@ pipeline { } stages { + stage('Front-end') { + agent { + docker { image 'node:7-alpine' } + } + steps { + echo 'Building FrontEnd...' + sh ''' + cd FrontEnd + npm install -g @angular/cli@1.7.4; + npm install + ng build --prod + ''' + } + } stage('Initialize') { steps { sh ''' @@ -17,39 +31,21 @@ pipeline { } stage('Build') { steps { - echo 'Building..' + echo 'Building...' sh ''' cd BackEnd mvn clean install -Dmaven.test.skip=true sh ''' } } - stage('Install dependencies') { - steps { - echo 'Install dependencies...' - sh ''' - cd FrontEnd - npm install -g @angular/cli@1.7.4; - npm install - ''' - } - } - stage('Build FrontEnd') { - steps { - echo 'Building...' - sh ''' - ng build --prod - ''' - } - } stage('Test') { steps { - echo 'Testing..' + echo 'Testing...' } } stage('Deploy') { steps { - echo 'Deploying....' + echo 'Deploying...' } } } From 6c440f3ad7c17f4806868d3fa5a29deef3b7ac00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:06:34 +0100 Subject: [PATCH 4/8] Remove nodejs from tools --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c77163f..68a00b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,6 @@ pipeline { tools { maven 'Default' jdk 'java-11-openjdk-amd64' - nodejs 'localNode' } stages { From c6da2ff7077faca2a96c6f3abcb297be8e085f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:08:41 +0100 Subject: [PATCH 5/8] Update Jenkinsfile --- Jenkinsfile | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68a00b2..aeb8b9c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,20 +6,6 @@ pipeline { } stages { - stage('Front-end') { - agent { - docker { image 'node:7-alpine' } - } - steps { - echo 'Building FrontEnd...' - sh ''' - cd FrontEnd - npm install -g @angular/cli@1.7.4; - npm install - ng build --prod - ''' - } - } stage('Initialize') { steps { sh ''' @@ -47,5 +33,18 @@ pipeline { echo 'Deploying...' } } + stage('Front-end') { + agent { + docker { image 'node:7-alpine' } + } + steps { + echo 'Building FrontEnd...' + sh ''' + cd FrontEnd + npm install + ng build --prod + ''' + } + } } } \ No newline at end of file From 6bd0fa502606a1f4ec0d21bf452cad957488864e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:11:44 +0100 Subject: [PATCH 6/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index aeb8b9c..38c5e94 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { } stage('Front-end') { agent { - docker { image 'node:7-alpine' } + docker { image 'node:10-alpine' } } steps { echo 'Building FrontEnd...' From 2f72ef9d4250597ef3cd6ed345d6b5383768c6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:22:33 +0100 Subject: [PATCH 7/8] Update Jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 38c5e94..5508031 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,8 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' + git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git + cd Punktonerzy cd FrontEnd npm install ng build --prod From 0ee0f951754c4bda1efca473d58411562d96d7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:24:20 +0100 Subject: [PATCH 8/8] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5508031..9a1686a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' + apt-get install git git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy cd FrontEnd