Merge pull request #32 from elastest/fix-e2e-jenkins-test

gortazar · web-flow · commit 219bd33c5f5c · 2020-04-25T19:23:43.000+02:00
Fixes #31: workaround to avoid git pipeline command failing in Jenkins
diff --git a/e2e-test/jenkinsfiles/jenkins-plugin/Jenkinsfile b/e2e-test/jenkinsfiles/jenkins-plugin/Jenkinsfile
@@ -50,9 +50,11 @@ node {
                         sh 'mkdir elastest-plugin'
                     }
                     dir(pluginDirectory) {
-                        git 'https://github.com/elastest/elastest-jenkins.git'
+                    	// Due to https://issues.jenkins-ci.org/browse/JENKINS-30600 we cannot use git here
+                        sh 'git clone https://github.com/elastest/elastest-jenkins.git'
                         echo 'Build ElasTest plugin'
-                        sh 'pwd; ls -lrt; mvn clean package -B'
+                        // For the same reason we have to cd manually into the elastest-jenkins folder created by git
+                        sh 'cd elastest-jenkins; pwd; ls -lrt; mvn clean package -B'
                     }
                 
                 stage ('prepare test')
@@ -66,7 +68,7 @@ node {
                     
                     dir(testRepositoryDirectory) {
                         echo 'Existing files before cloning the git repository'
-                        git 'https://github.com/elastest/elastest-torm.git'
+                        sh 'git clone https://github.com/elastest/elastest-torm.git'
                     }
                 
                     echo 'Prepare network'

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,11 @@ node {`
`50`	`50`	`sh 'mkdir elastest-plugin'`
`51`	`51`	`}`
`52`	`52`	`dir(pluginDirectory) {`
`53`		`- git 'https://github.com/elastest/elastest-jenkins.git'`
	`53`	`+ // Due to https://issues.jenkins-ci.org/browse/JENKINS-30600 we cannot use git here`
	`54`	`+ sh 'git clone https://github.com/elastest/elastest-jenkins.git'`
`54`	`55`	`echo 'Build ElasTest plugin'`
`55`		`- sh 'pwd; ls -lrt; mvn clean package -B'`
	`56`	`+ // For the same reason we have to cd manually into the elastest-jenkins folder created by git`
	`57`	`+ sh 'cd elastest-jenkins; pwd; ls -lrt; mvn clean package -B'`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`stage ('prepare test')`
`@@ -66,7 +68,7 @@ node {`
`66`	`68`
`67`	`69`	`dir(testRepositoryDirectory) {`
`68`	`70`	`echo 'Existing files before cloning the git repository'`
`69`		`- git 'https://github.com/elastest/elastest-torm.git'`
	`71`	`+ sh 'git clone https://github.com/elastest/elastest-torm.git'`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`echo 'Prepare network'`