Compare commits

..

No commits in common. "111b8f37ad74530ffaba1ed07593e6f3c58e837d" and "f3175e537bac52f51d004aea01d438cd48ba76dc" have entirely different histories.

2 changed files with 18 additions and 44 deletions

View File

@ -1,26 +0,0 @@
#dnet-hadoop connection properties for iis-cdh5-test-gw
dhp.hadoop.frontend.temp.dir=/home/jenkins
dhp.hadoop.frontend.user.name=jenkins
dhp.hadoop.frontend.host.name=iis-cdh5-test-gw.ocean.icm.edu.pl
dhp.hadoop.frontend.port.ssh=22
oozieServiceLoc=http://iis-cdh5-test-m3:11000/oozie
jobTracker=yarnRM
nameNode=hdfs://nameservice1
oozie.execution.log.file.location = target/extract-and-run-on-remote-host.log
maven.executable=mvn
#common spark related
sparkDriverMemory=7G
sparkExecutorMemory=7G
sparkExecutorCores=4
#spark 1 related
oozieActionShareLibForSpark1=spark
spark1YarnHistoryServerAddress=http://iis-cdh5-test-gw.ocean.icm.edu.pl:18088
spark1EventLogDir=/user/spark/applicationHistory
#spark 2 related
oozieActionShareLibForSpark2=spark2
spark2YarnHistoryServerAddress=http://iis-cdh5-test-gw.ocean.icm.edu.pl:18089
spark2EventLogDir=/user/spark/spark2ApplicationHistory

View File

@ -21,24 +21,24 @@ pipeline {
} }
} }
stage("00-Upload-aggregatorGraph") { // stage("Upload") {
steps { // steps {
configFileProvider([configFile(fileId: "dnet-hadoop-build.properties", variable: 'BUILD_PROPERTIES')]) { // configFileProvider([configFile(fileId: "iis-build-properties", variable: 'BUILD_PROPERTIES')]) {
load "${BUILD_PROPERTIES}" // load "${BUILD_PROPERTIES}"
withEnv(["JAVA_HOME=${ tool type: 'jdk', name: "${JDK_VERSION}" }", // withEnv(["JAVA_HOME=${ tool type: 'jdk', name: "${JDK_VERSION}" }",
"PATH+MAVEN=${tool type: 'maven', name: "${MAVEN_VERSION}"}/bin:${env.JAVA_HOME}/bin"]) { // "PATH+MAVEN=${tool type: 'maven', name: "${MAVEN_VERSION}"}/bin:${env.JAVA_HOME}/bin"]) {
sshagent(['dnet-hadoop-deployment-credentials']) { // sshagent(['iis-deployment-credentials']) {
sh """ // sh """
cd dhp-workflows/dhp-graph-mapper && \ // cd iis-wf/iis-wf-primary && \
mvn clean package -Poozie-package,deploy \ // mvn clean package -Poozie-package,deploy \
-Dworkflow.source.dir=eu/dnetlib/dhp/oa/graph/raw_all \ // -Dworkflow.source.dir=eu/dnetlib/iis/wf/primary/main \
-DdhpConnectionProperties=${WORKSPACE}/connection-properties/iis-cdh5-test-gw.properties // -DiisConnectionProperties=${WORKSPACE}/connection-properties/iis-cdh5-test-gw.properties
""" // """
} // }
} // }
} // }
} // }
} // }
// stage("Deploy") { // stage("Deploy") {
// steps { // steps {