From e3c61b1707b56a328fd3b3fe410c20826e79c4ce Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Thu, 10 Sep 2020 13:56:20 +0200
Subject: [PATCH] Jenkinsfile updated to avoid openvidu-java-client overwrite
 when checking out

---
 openvidu-test-e2e/jenkins/Jenkinsfile | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile
index 11f92a0d..043e5bb4 100644
--- a/openvidu-test-e2e/jenkins/Jenkinsfile
+++ b/openvidu-test-e2e/jenkins/Jenkinsfile
@@ -38,11 +38,6 @@ node('container') {
             fi
         '''.stripIndent())
         }
-        stage('OpenVidu parent build') {
-          sh 'cd openvidu/openvidu-java-client && mvn --batch-mode versions:set -DnewVersion=1.0.0-TEST'
-          sh 'cd openvidu && mvn --batch-mode versions:set-property -Dproperty=version.openvidu.java.client -DnewVersion=1.0.0-TEST'
-          sh 'cd openvidu && mvn --batch-mode -DskipTests=true clean install'
-        }
         stage('OpenVidu Browser build') {
           sh(script: '''#!/bin/bash
             cd openvidu
@@ -74,6 +69,11 @@ node('container') {
         stage('OpenVidu TestApp build') {
           sh 'cd openvidu/openvidu-testapp && npm install --unsafe-perm && npm install /opt/openvidu/openvidu-browser-*.tgz && npm install /opt/openvidu/openvidu-node-client-*.tgz && export NG_CLI_ANALYTICS="false" && ./node_modules/@angular/cli/bin/ng build --prod'
         }
+        stage('OpenVidu parent build') {
+          sh 'cd openvidu/openvidu-java-client && mvn --batch-mode versions:set -DnewVersion=1.0.0-TEST'
+          sh 'cd openvidu && mvn --batch-mode versions:set-property -Dproperty=version.openvidu.java.client -DnewVersion=1.0.0-TEST'
+          sh 'cd openvidu && mvn --batch-mode -DskipTests=true clean install'
+        }
         stage('OpenVidu Server unit tests') {
           sh 'cd openvidu/openvidu-server && mvn --batch-mode -Dtest=io.openvidu.server.test.unit.*Test test'
         }
@@ -82,15 +82,9 @@ node('container') {
         }
         stage('OpenVidu Server build') {
           sh(script: '''#!/bin/bash
-            cd openvidu
-            if [[ $OPENVIDU_SERVER_COMMIT != "default" ]]; then
-              git checkout -f $OPENVIDU_SERVER_COMMIT
-            fi
-            cd openvidu-server/src/dashboard && npm install --unsafe-perm && npm install /opt/openvidu/openvidu-browser-*.tgz && export NG_CLI_ANALYTICS="false" && npm run build-prod
+            cd openvidu/openvidu-server/src/dashboard && npm install --unsafe-perm && npm install /opt/openvidu/openvidu-browser-*.tgz && export NG_CLI_ANALYTICS="false" && npm run build-prod
             cd ../.. && mvn --batch-mode clean compile package
             cp target/openvidu-server*.jar /opt/openvidu
-            cd ..
-            git checkout -f $OPENVIDU_COMMIT
         '''.stripIndent())
         }
         stage ('Environment Launch') {