Commit 1b86a747 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by Stuart Sides
Browse files

Fix for CSV errors in Jenkins (#3625) 

* hushed Geos Warning

moved flag location

csvdiff now outputs everything

explicit export

removed warning line

* reverted redirect

* reverted cmakelists

* reverted weird slash

* moved install

* slashes

* explicit mac cleaup
parent 2a9ba5b1

Jenkinsfile

+7 −2
Original line number Diff line number Diff line
@@ -75,14 +75,14 @@ pipeline { 
                  env.STAGE_STATUS = "Creating conda environment"

                  

                  if (lower_label == "mac") {

                    condaPath = "/tmp/" + sh(script: '{ date "+%m/%d/%y|%H:%M:%S:%m"; echo $WORKSPACE; } | md5 | tr -d "\n";', returnStdout: true) 

                    condaPath = "/tmp/macbuilds/" + sh(script: '{ date "+%m/%d/%y|%H:%M:%S:%m"; echo $WORKSPACE; } | md5 | tr -d "\n";', returnStdout: true) 

                    

                    sh """

                      mkdir -p /tmp/macbuilds/

                      curl -o miniconda.sh  https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh

                      bash miniconda.sh -b -p ${condaPath}

                      """

                  } else {

                    condaPrefix = "/home/jenkins/.conda/envs/isis/"

                    condaPath = "/home/jenkins/.conda/"

                  }
@@ -146,6 +146,7 @@ pipeline { 
                                env.STAGE_STATUS = "Running app tests on ${label}"

                                sh """

                                    source activate ${condaPath}/envs/isis

                                    export PATH="${condaPath}bin/:$PATH"

                                    echo $PATH

                                    ctest -R _app_ -j4 -VV

                                """
@@ -186,6 +187,10 @@ pipeline { 
                        }

                      }

                      

                      if (lower_label == "mac") {

                        sh "rm -rf ${condaPath}"

                      }



                      if(build_ok) {

                          currentBuild.result = "SUCCESS"

                      }

isis/make/isismake.tsts

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ comparefiles: FORCE 
	      fi;                                                                  \

	                                                                           \

	      $(ISISROOT)/scripts/csvdiff.py $(TRUTH)/$$FILE $(OUTPUT)/$$FILE      \

	          $$DIFFFILE >& /dev/null;                                         \

	          $$DIFFFILE > /dev/null;                                          \

	                                                                           \

	      RETVAL=$$?;                                                          \

	      if [ $$RETVAL != 0 ]; then                                           \