Change scripts and fix checkstyle

eclipse · Mar 14, 2017 · e10e538 · e10e538
1 parent ba26c06
commit e10e538
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 30 deletions.
diff --git a/...epairnator-dockerpool/src/main/java/fr/inria/spirals/repairnator/dockerpool/Launcher.java b/...epairnator-dockerpool/src/main/java/fr/inria/spirals/repairnator/dockerpool/Launcher.java
@@ -162,7 +162,7 @@ private void killDockerContainers() {
             }
             docker.close();
         } catch (DockerCertificateException|InterruptedException|DockerException e) {
-           LOGGER.error("Error while killing docker containers",e);
+            LOGGER.error("Error while killing docker containers",e);
         }
     }
 

diff --git a/...pool/src/main/java/fr/inria/spirals/repairnator/dockerpool/RunnablePipelineContainer.java b/...pool/src/main/java/fr/inria/spirals/repairnator/dockerpool/RunnablePipelineContainer.java
@@ -1,7 +1,6 @@
 package fr.inria.spirals.repairnator.dockerpool;
 
 import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.messages.ContainerConfig;
 import com.spotify.docker.client.messages.ContainerCreation;

diff --git a/repairnator/scripts/build_repairnator.sh b/repairnator/scripts/build_repairnator.sh
@@ -10,13 +10,13 @@ fi
 
 cd $HOME_REPAIR/github/nopol/nopol
 git pull
-mvn clean install
+mvn clean install -DskipTests=true
 
 cd $HOME_REPAIR/github/librepair
 git pull
 
 cd jtravis
-mvn clean install
+mvn clean install -DskipTests=true
 
 cd ../repairnator
-mvn clean install
+mvn clean install -DskipTests=true
diff --git a/repairnator/scripts/launch_repairnator.sh b/repairnator/scripts/launch_repairnator.sh
@@ -1,27 +1,15 @@
 #!/bin/bash
 
-echo "Set environment variables"
-./set_env_variable.sh
-
-DOCKER_VERSION=`date "+%Y-%m-%d_%H%M"`
-DOCKER_TAG=repairnator/pipeline:$DOCKER_VERSION
-
-REPAIRNATOR_RUN_DIR=$HOME_REPAIR/bin/`date "+%Y-%m-%d_%H%M"`
-REPAIRNATOR_DOCKER_DIR=$REPAIRNATOR_RUN_DIR/dockerImage
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
 
-REPAIRNATOR_SCANNER_JAR="./repairnator-scanner/target/repairnator-scanner-*-jar-with-dependencies.jar"
-REPAIRNATOR_SCANNER_DEST_JAR=$REPAIRNATOR_RUN_DIR/repairnator-scanner.jar
-
-REPAIRNATOR_DOCKERPOOL_JAR="./repairnator-dockerpool/target/repairnator-dockerpool-*-jar-with-dependencies.jar"
-REPAIRNATOR_DOCKERPOOL_DEST_JAR=$REPAIRNATOR_RUN_DIR/repairnator-dockerpool.jar
-
-REPAIRNATOR_PIPELINE_JAR="./repairnator-pipeline/target/repairnator-pipeline-*-jar-with-dependencies.jar"
-REPAIRNATOR_PIPELINE_DEST_JAR=$REPAIRNATOR_DOCKER_DIR/repairnator-pipeline.jar
+echo "Set environment variables"
+source $SCRIPT_DIR/set_env_variable.sh
 
-REPAIRNATOR_BUILD_LIST=$REPAIRNATOR_RUN_DIR/list_build.txt
+echo "Create log directory: $LOG_DIR"
+mkdir $LOG_DIR
 
 echo "Start building a new version of repairnator"
-./build_repairnator.sh
+$SCRIPT_DIR/build_repairnator.sh
 
 if [[ $? != 0 ]]
 then

diff --git a/repairnator/scripts/set_env_variable.sh b/repairnator/scripts/set_env_variable.sh
@@ -1,19 +1,30 @@
 #!/bin/bash
 
-export M2_HOME=/opt/apache-maven-3.3.9
-export PATH=$PATH:$M2_HOME/bin
-
 export GITHUB_LOGIN=
 export GITHUB_OAUTH=
 export HOME_REPAIR=
 export NB_THREADS=4
 export LOG_DIR=$HOME_REPAIR/logs/`date "+%Y-%m-%d_%H%M"`
-
-mkdir $LOG_DIR
-
 export REPAIR_PROJECT_LIST_PATH=$HOME_REPAIR/scripts/project_list.txt
 export REPAIR_OUTPUT_PATH=/var/www/html/repairnator/
 export REPAIR_DOCKER_IMG_DIR=$HOME_REPAIR/dockerImage/
 export GOOGLE_SECRET_PATH=$HOME_REPAIR/client_secret.json
 export SCANNER_NB_HOURS=4
-export SCANNER_MODE=repair
+export SCANNER_MODE=repair
+
+export DOCKER_VERSION=`date "+%Y-%m-%d_%H%M"`
+export DOCKER_TAG=repairnator/pipeline:$DOCKER_VERSION
+
+export REPAIRNATOR_RUN_DIR=$HOME_REPAIR/bin/`date "+%Y-%m-%d_%H%M"`
+export REPAIRNATOR_DOCKER_DIR=$REPAIRNATOR_RUN_DIR/dockerImage
+
+export REPAIRNATOR_SCANNER_JAR="./repairnator-scanner/target/repairnator-scanner-*-jar-with-dependencies.jar"
+export REPAIRNATOR_SCANNER_DEST_JAR=$REPAIRNATOR_RUN_DIR/repairnator-scanner.jar
+
+export REPAIRNATOR_DOCKERPOOL_JAR="./repairnator-dockerpool/target/repairnator-dockerpool-*-jar-with-dependencies.jar"
+export REPAIRNATOR_DOCKERPOOL_DEST_JAR=$REPAIRNATOR_RUN_DIR/repairnator-dockerpool.jar
+
+export REPAIRNATOR_PIPELINE_JAR="./repairnator-pipeline/target/repairnator-pipeline-*-jar-with-dependencies.jar"
+export REPAIRNATOR_PIPELINE_DEST_JAR=$REPAIRNATOR_DOCKER_DIR/repairnator-pipeline.jar
+
+export REPAIRNATOR_BUILD_LIST=$REPAIRNATOR_RUN_DIR/list_build.txt