Skip to content

Commit 4058930

Browse files
DHFPROD-7720: Fixing props (#6011)
1 parent 4c91ece commit 4058930

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Jenkinsfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ void dh5Example() {
326326
docker exec -u builder -i '''+dockerhost+''' /bin/sh -c "su -builder;export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;\
327327
export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR; \
328328
export M2_HOME=$MAVEN_HOME/bin; \
329-
export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin; \
329+
export PATH=$JAVA_HOME/bin:$WORKSPACE$GRADLE_DIR:$PATH:$MAVEN_HOME/bin; \
330330
cd $WORKSPACE/data-hub/examples/dh-5-example; \
331-
rm -rf $GRADLE_USER_HOME/caches; \
332-
cp ~/.gradle/gradle.properties $GRADLE_USER_HOME; \
331+
rm -rf $WORKSPACE$GRADLE_DIR/caches; \
332+
cp ~/.gradle/gradle.properties $WORKSPACE$GRADLE_DIR; \
333333
./gradlew -i hubInit -Ptesting=true; \
334334
cp ../../marklogic-data-hub/gradle.properties .; \
335335
./gradlew -i mlDeploy -Ptesting=true -PmlUsername=admin -PmlPassword=admin; \
@@ -351,10 +351,10 @@ void dhCustomHook() {
351351
docker exec -u builder -i '''+dockerhost+''' /bin/sh -c "su -builder;export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;\
352352
export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR; \
353353
export M2_HOME=$MAVEN_HOME/bin; \
354-
export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin; \
354+
export PATH=$JAVA_HOME/bin:$WORKSPACE$GRADLE_DIR:$PATH:$MAVEN_HOME/bin; \
355355
cd $WORKSPACE/data-hub/examples/dhf5-custom-hook; \
356-
rm -rf $GRADLE_USER_HOME/caches; \
357-
cp ~/.gradle/gradle.properties $GRADLE_USER_HOME;\
356+
rm -rf $WORKSPACE$GRADLE_DIR/caches; \
357+
cp ~/.gradle/gradle.properties $WORKSPACE$GRADLE_DIR;\
358358
./gradlew -i hubInit -Ptesting=true; \
359359
cp ../../marklogic-data-hub/gradle.properties .; \
360360
./gradlew -i mlDeploy -Ptesting=true -PmlUsername=admin -PmlPassword=admin; \
@@ -375,10 +375,10 @@ void mappingExample() {
375375
docker exec -u builder -i '''+dockerhost+''' /bin/sh -c "su -builder;export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;\
376376
export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR; \
377377
export M2_HOME=$MAVEN_HOME/bin; \
378-
export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin; \
378+
export PATH=$JAVA_HOME/bin:$WORKSPACE$GRADLE_DIR:$PATH:$MAVEN_HOME/bin; \
379379
cd $WORKSPACE/data-hub/examples/mapping-example; \
380-
rm -rf $GRADLE_USER_HOME/caches; \
381-
cp ~/.gradle/gradle.properties $GRADLE_USER_HOME; \
380+
rm -rf $WORKSPACE$GRADLE_DIR/caches; \
381+
cp ~/.gradle/gradle.properties $WORKSPACE$GRADLE_DIR; \
382382
./gradlew -i hubInit -Ptesting=true; \
383383
cp ../../marklogic-data-hub/gradle.properties .; \
384384
./gradlew -i mlDeploy -Ptesting=true -PmlUsername=admin -PmlPassword=admin; \
@@ -401,10 +401,10 @@ void smartMastering() {
401401
docker exec -u builder -i '''+dockerhost+''' /bin/sh -c "su -builder;export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;\
402402
export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR; \
403403
export M2_HOME=$MAVEN_HOME/bin; \
404-
export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin; \
404+
export PATH=$JAVA_HOME/bin:$WORKSPACE$GRADLE_DIR:$PATH:$MAVEN_HOME/bin; \
405405
cd $WORKSPACE/data-hub/examples/smart-mastering-complete; \
406-
rm -rf $GRADLE_USER_HOME/caches; \
407-
cp ~/.gradle/gradle.properties $GRADLE_USER_HOME; \
406+
rm -rf $WORKSPACE$GRADLE_DIR/caches; \
407+
cp ~/.gradle/gradle.properties $WORKSPACE$GRADLE_DIR; \
408408
./gradlew -i hubInit -Ptesting=true; \
409409
cp ../../marklogic-data-hub/gradle.properties .; \
410410
./gradlew -i mlDeploy -Ptesting=true -PmlUsername=admin -PmlPassword=admin; \

0 commit comments

Comments
 (0)