Merge pull request #145 from danieljamesrees/parameterise-plugins-path

Parameterise plugins path

Author: Darren Jones

ci/tasks/test-jenkins.yml

@@ -27,11 +27,12 @@ run:
       export JENKINS_HOST="http://localhost:8080"
     popd
 
+    export INSTALLED_PLUGINS_FILE_PATH="${PWD}/devtools-boshrelease/src/jenkins/plugins.txt"
     cp -R devtools-boshrelease/ci/tests/jenkinstest /go/src/
     sleep 10
 
     pushd /go/src/jenkinstest
       go get github.com/DATA-DOG/godog/cmd/godog
       set -e
       godog
-    popd
+	popd

ci/tests/jenkinstest/plugins_test.go

@@ -10,7 +10,8 @@ import (
 )
 
 const (
-	PLUGIN_MANAGER_URL string = "/pluginManager/api/json?depth=1&tree=plugins[shortName,version]"
+	INSTALLED_PLUGINS_FILE_PATH string = "INSTALLED_PLUGINS_FILE_PATH"
+	PLUGIN_MANAGER_URL          string = "/pluginManager/api/json?depth=1&tree=plugins[shortName,version]"
 )
 
 type Plugins struct {
@@ -55,9 +56,8 @@ func getAllInstalledPlugins() (Plugins, error) {
 
 func getAllExpectedPlugins() (Plugins, error) {
 	var plugins Plugins
-	filePath, _ := os.Getwd()
 
-	p, err := ioutil.ReadFile(filePath + "/../../../src/jenkins/plugins.txt")
+	p, err := ioutil.ReadFile(os.Getenv(INSTALLED_PLUGINS_FILE_PATH))
 
 	if err != nil {
 		return Plugins{}, fmt.Errorf("%s", err)