diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index aec72777d78..3923d7f37d1 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -60,6 +60,9 @@ jobs: friendly_name: Centaur Engine Upgrade Local with MySQL 5.7 - build_type: referenceDiskManifestBuilderApp friendly_name: Reference Disk Manifest Builder App + - build_type: centaurSlurm + build_mysql: 5.7 + friendly_name: "Centaur Slurm with MySQL 5.7" name: ${{ matrix.friendly_name }} env: BUILD_NAME: ${{ matrix.build_type }} diff --git a/.travis.yml b/.travis.yml index 9ffb48b1147..6e9ad601439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,9 +47,6 @@ env: - >- BUILD_TYPE=centaurPapiV2beta BUILD_MYSQL=5.7 - - >- - BUILD_TYPE=centaurSlurm - BUILD_MYSQL=5.7 - >- BUILD_TYPE=centaurTes BUILD_MYSQL=5.7 diff --git a/src/ci/bin/test_slurm.inc.sh b/src/ci/bin/test_slurm.inc.sh index 039408271f9..f5c0434a3ce 100644 --- a/src/ci/bin/test_slurm.inc.sh +++ b/src/ci/bin/test_slurm.inc.sh @@ -21,21 +21,23 @@ cromwell::build::slurm::setup_slurm_environment() { # https://slurm.schedmd.com/ sudo apt-get update - # Try the Lawrence Livermore National Laboratory (LLNL) version first - sudo apt-get install -y slurm-llnl || sudo apt-get install -y slurm-wlm + sudo apt-get install -y slurm-wlm + # As an alternative to 'slurm-wlm', you may also try 'slurm-llnl'. + # If you use 'slurm-llnl', change the below tee path to '/etc/slurm-llnl/slurm.conf' + # For reasons that are unclear, slurm-llnl doesn't work in Github Actions, and slurm-wlm doesn't work in Travis. + # We transitioned from slurm-llnl to slurm-wlm when moving from Travis to Github Actions. + # See the PR associated with ticket WX-888. # Create various directories used by slurm - sudo mkdir -p /etc/slurm-llnl - sudo mkdir -p /var/run/slurm-llnl sudo mkdir -p /var/run/munge sudo mkdir -p /var/spool/slurmd - # A mash of configure-until-it-runs. Feel free to PR suggestions/fixes + # A mash of configure-until-it-runs. Feel free to PR suggestions/fixes. # https://slurm.schedmd.com/tutorials.html # https://slurm.schedmd.com/configurator.html # https://slurm.schedmd.com/slurm.conf.html # https://slurm.schedmd.com/quickstart_admin.html - cat </dev/null + cat </dev/null ClusterName=localhost ControlMachine=localhost NodeName=localhost