Skip to content

Commit e2e992b

Browse files
author
Yoshito Umaoka
committed
Pass project build dir to maven invoker plugin hook
gp-maven-plugin integration tests are failing if they are invoked from the parent project directory because build output directory is hardcoded in the groovy hook scripts. Use <scriptVariables> to pass the project build directory to the hook scripts, so the test goal is properly invoked from any directories.
1 parent df8549b commit e2e992b

7 files changed

Lines changed: 9 additions & 6 deletions

File tree

gp-maven-plugin/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@
139139
<pomIncludes>
140140
<pomInclude>*/pom.xml</pomInclude>
141141
</pomIncludes>
142+
<scriptVariables>
143+
<bldDir>${project.build.directory}</bldDir>
144+
</scriptVariables>
142145
<preBuildHookScript>setup</preBuildHookScript>
143146
<postBuildHookScript>verify</postBuildHookScript>
144147
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>

gp-maven-plugin/src/it/t1-basic-upload-fail/setup.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import java.util.regex.*
2121

2222
try {
2323
println "Set up for basic upload fail test"
24-
com.ibm.g11n.pipeline.maven.ITTools.createCredentialsFile("target/it/t1-basic-upload-fail", "setup.properties")
24+
com.ibm.g11n.pipeline.maven.ITTools.createCredentialsFile(bldDir + "/it/t1-basic-upload-fail", "setup.properties")
2525

2626
} catch( Throwable t ) {
2727
t.printStackTrace()

gp-maven-plugin/src/it/t2-basic-upload-success/setup.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import java.util.regex.*
2222

2323
try {
2424
println "Set up for basic upload success test"
25-
com.ibm.g11n.pipeline.maven.ITTools.createCredentialsFile("target/it/t2-basic-upload-success", "setup.properties")
25+
com.ibm.g11n.pipeline.maven.ITTools.createCredentialsFile(bldDir + "/it/t2-basic-upload-success", "setup.properties")
2626
} catch( Throwable t ) {
2727
t.printStackTrace()
2828
return false

gp-maven-plugin/src/it/t2-basic-upload-success/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.ibm.g11n.pipeline.client.*
2323

2424
try {
2525
println "verifying that upload succeeded"
26-
String location = "target/it/t2-basic-upload-success";
26+
String location = bldDir + "/it/t2-basic-upload-success";
2727
String propfile = "setup.properties"
2828
def propertyMap = ITTools.loadProperties(location, propfile);
2929
Credentials creds = ITTools.getCredentials(location, propfile);

gp-maven-plugin/src/it/t3-basic-download-fail/setup.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import java.util.regex.*
2121

2222
try {
2323
println "setup for basic download fail test"
24-
com.ibm.g11n.pipeline.maven.ITTools.createCredentialsFile("target/it/t3-basic-download-fail", "setup.properties")
24+
com.ibm.g11n.pipeline.maven.ITTools.createCredentialsFile(bldDir + "/it/t3-basic-download-fail", "setup.properties")
2525
} catch( Throwable t ) {
2626
t.printStackTrace()
2727
return false

gp-maven-plugin/src/it/t4-basic-download-success/setup.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import java.util.regex.*
2121

2222
try {
2323
println "setup for basic download success test"
24-
com.ibm.g11n.pipeline.maven.ITTools.createCredentialsFile("target/it/t4-basic-download-success", "setup.properties")
24+
com.ibm.g11n.pipeline.maven.ITTools.createCredentialsFile(bldDir + "/it/t4-basic-download-success", "setup.properties")
2525
} catch( Throwable t ) {
2626
t.printStackTrace()
2727
return false

gp-maven-plugin/src/it/t4-basic-download-success/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.google.gson.*
2323

2424
try {
2525
println "verifying that download happened successfully"
26-
String location="target/it/t4-basic-download-success"
26+
String location = bldDir + "/it/t4-basic-download-success"
2727
String targetLocation = location + "/target/classes/com/bundle1"
2828
def dir = new File(targetLocation)
2929
int filecount = 0

0 commit comments

Comments
 (0)