Unverified Commit 5a8dbdc8 authored by jlaura's avatar jlaura Committed by GitHub
Browse files

Update Jenkinsfile (#4732) 

* Update Jenkinsfile

Fixes #4730 to to set the max cores to 4 (the AWS EKS max) and fixes #4731 to update the conda cache URL

* Update Jenkinsfile

* Updates Jenkinsfile to set timeout on app and module tests

* Update environment.yml

* Update Jenkinsfile

* Update meta.yaml
parent ac0fcd5b

Jenkinsfile

+4 −4
Original line number Diff line number Diff line 
// vim: ft=groovy



def NUM_CORES = 8

def NUM_CORES = 4

def errors = []

def labels = ['Ubuntu'] // labels for Jenkins node types we will build on

def nodes = [:]
@@ -34,7 +34,7 @@ for (lbl in labels) { 
                condaEnv("isis3") {

                    // Environment

                    loginShell """

                        conda config --env --set channel_alias https://conda.wr.usgs.gov

                        conda config --env --set channel_alias https://conda.prod-asc.chs.usgs.gov

                        conda config --env --set remote_read_timeout_secs 3600

                        conda install -c conda-forge python=3 findutils

                        conda env update -f ${envFile} --prune
@@ -72,14 +72,14 @@ for (lbl in labels) { 
                            // App tests

                            stageStatus = "Running app tests on ${label}"

                            try {

                                loginShell "ctest -R _app_ -j${NUM_CORES} --output-on-failure"

                                loginShell "ctest -R _app_ -j${NUM_CORES} --output-on-failure --timeout 10000"

                            } catch(e) {

                                errors.add(stageStatus)

                                osFailed = true

                            }



                            try {

                                loginShell "ctest -R _module_ -j${NUM_CORES} --output-on-failure"

                                loginShell "ctest -R _module_ -j${NUM_CORES} --output-on-failure --timeout 10000" 

                            } catch(e) {

                                errors.add(stageStatus)

                                osFailed = true

environment.yml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ dependencies: 
  - mesalib

  - mysql

  - mysql-connector-c

  - nanoflann

  - nanoflann<1.4

  - nlohmann_json

  - ninja==1.7.2

  - nn

recipe/meta.yaml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ requirements: 
   - mesalib

   - mysql

   - mysql-connector-c

   - nanoflann

   - nanoflann<1.4

   - nlohmann_json

   - ninja==1.7.2

   - nn