Commit c1f322e2 authored by Evin Dunn's avatar Evin Dunn Committed by jlaura
Browse files

Fixes conda channels in Jenkinsfile & adds a MacOS node (#633)

parent 6d7964c5

Jenkinsfile

+48 −12
Original line number Diff line number Diff line
@@ -9,9 +9,11 @@ nodes["isis-fedora-25"] = { 
                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    sed -i "s|usgs-astrogeology|http://astro-bin.wr.usgs.gov/conda-usgs-astrogeology|" environment.yml

//                    sed -i "s|conda-forge|http://astro-bin.wr.usgs.gov/conda-forge|" environment.yml

//                    sed -i "s|defaults|http://astro-bin.wr.usgs.gov/conda|" environment.yml

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build
@@ -35,9 +37,11 @@ nodes["isis-centos-7"] = { 
                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    sed -i "s|usgs-astrogeology|http://astro-bin.wr.usgs.gov/conda-usgs-astrogeology|" environment.yml

//                    sed -i "s|conda-forge|http://astro-bin.wr.usgs.gov/conda-forge|" environment.yml

//                    sed -i "s|defaults|http://astro-bin.wr.usgs.gov/conda|" environment.yml

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build
@@ -61,9 +65,11 @@ nodes["isis-debian-9"] = { 
                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    sed -i "s|usgs-astrogeology|http://astro-bin.wr.usgs.gov/conda-usgs-astrogeology|" environment.yml

//                    sed -i "s|conda-forge|http://astro-bin.wr.usgs.gov/conda-forge|" environment.yml

//                    sed -i "s|defaults|http://astro-bin.wr.usgs.gov/conda|" environment.yml

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build
@@ -87,9 +93,39 @@ nodes["isis-ubuntu-1804"] = { 
                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    sed -i "s|usgs-astrogeology|http://astro-bin.wr.usgs.gov/conda-usgs-astrogeology|" environment.yml

//                    sed -i "s|conda-forge|http://astro-bin.wr.usgs.gov/conda-forge|" environment.yml

//                    sed -i "s|defaults|http://astro-bin.wr.usgs.gov/conda|" environment.yml

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build

//                    cmake -GNinja -DJP2KFLAG=OFF -Dpybindings=OFF -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis

//                    set +e

//                    ninja -j8 && ninja install

//                    source /usgs/cpkgs/isis3/isis3mgr_scripts/initIsisCmake.sh .

//                    ctest -V -R _unit_ --timeout 500

//                    ctest -V -R _app_ --timeout 500

//                    ctest -V -R _module_ --timeout 500

//                """

            }

        }

    }

}



nodes["mac1013"] = {

    node("mac1013") {

        withEnv(["ISISROOT=" + "${workspace}" + "/build/", "ISIS3TESTDATA=/usgs/cpkgs/isis3/testData/", "ISIS3DATA=/usgs/cpkgs/isis3/data/"]) {

            stage ("MacOS 10.13 (High Sierra)") {

                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build