Merge pull request #48 from natefoo/test-20.11

Fix functional tests for 20.11

Author: natefoo

.github/workflows/slurm-drmaa.yaml

@@ -0,0 +1,62 @@
+name: slurm-drmaa
+#on: [push, pull_request]
+on: [pull_request]
+jobs:
+  functional:
+    name: Functional Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+        - os: ubuntu-latest
+          docker_image: centos:7
+          slurm_version: 18.08
+        - os: ubuntu-latest
+          docker_image: centos:7
+          slurm_version: 19.05
+        - os: ubuntu-latest
+          docker_image: centos:7
+          slurm_version: 20.02
+        - os: ubuntu-latest
+          docker_image: centos:7
+          slurm_version: 20.11
+        - os: ubuntu-latest
+          docker_image: debian:buster
+          slurm_version: apt
+    env:
+      DOCKER_IMAGE: ${{ matrix.docker_image }}
+      SLURM_VERSION: ${{ matrix.slurm_version }}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Fetch bats
+      run: git clone https://github.com/bats-core/bats-core.git/ .ci/bats
+    - name: Install autogen dependencies
+      run: sudo apt-get install -y gperf ragel bison
+    - name: Run autogen
+      run: sh autogen.sh
+    - name: Configure drmaa_utils
+      run: cd drmaa_utils && ./configure
+    - name: Build drmaa_utils
+      run: make -C drmaa_utils/drmaa_utils conf_tab.c conf_tab.h datetime_tab.c datetime_tab.h drmaa_attrib.c timedelta.c
+    - name: Clean drmaa_utils
+      run: make -C drmaa_utils distclean
+    - name: Build Docker image
+      run: docker build --build-arg from=$DOCKER_IMAGE --build-arg uid=$(id -u) --build-arg gid=$(id -g) --build-arg version=$SLURM_VERSION -t ci/$DOCKER_IMAGE -f .ci/Dockerfile .ci
+    - name: Run ./configure
+      run: docker run --volume $(pwd):$(pwd) --workdir $(pwd) --user $(id -u):$(id -g) ci/$DOCKER_IMAGE ./configure --prefix=/ci
+    - name: Run make install
+      run: docker run --volume $(pwd):$(pwd) --volume $(pwd)/.ci:/ci --workdir $(pwd) --user $(id -u):$(id -g) ci/$DOCKER_IMAGE make install
+    - name: Run Slurm
+      run: echo cid=$(docker run --volume $(pwd):$(pwd) --volume $(pwd)/.ci:/ci --detach ci/$DOCKER_IMAGE /runslurm.sh) >> $GITHUB_ENV
+    - name: Wait for slurmctld
+      run: for i in {0..29}; do [ "$(docker exec $cid sinfo --noheader --nodes=localhost --format=%t --responding --states=IDLE)" == "idle" ] && break || { echo "waiting for slurmctld..."; sleep 1; }; done; echo slurmctld_attempt=$i >> $GITHUB_ENV
+    - name: Node info
+      run: docker exec $cid scontrol show node localhost
+    - name: Partition info
+      run: docker exec $cid scontrol show partition debug
+    - name: Log failure
+      run: if [ $slurmctld_attempt -eq 29 ]; then echo "[slurmctld.log]"; cat .ci/slurmctld.log; echo "[slurmd.log]"; cat .ci/slurmd.log; exit 1; fi
+    - name: Run tests
+      run: docker exec --workdir $(pwd) $cid make check || { echo "[test-suite.log]"; cat test/test-suite.log; echo "[functional-basic.log]"; cat test/functional-basic.log; exit 1; }

.travis.yml

@@ -1,6 +1,7 @@
 /*
  * PSNC DRMAA for SLURM
- * Copyright (C) 2011 Poznan Supercomputing and Networking Center
+ * Copyright (C) 2011-2015 Poznan Supercomputing and Networking Center
+ * Copyright (C) 2014-2021 The Pennsylvania State University
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -62,7 +63,7 @@ slurmdrmaa_get_DRM_system( fsd_drmaa_singletone_t *self )
 {
 	if(slurmdrmaa_version[0] == '\0') /*no locks as drmaa_get_drm_system is usually called only once */
 	{
-#if SLURM_VERSION_NUMBER > SLURM_VERSION_NUM(20,11,0)
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(20,11,0)
 		slurm_conf_t * conf_info_msg_ptr = NULL; 
 #else
 		slurm_ctl_conf_t * conf_info_msg_ptr = NULL; 

slurm_drmaa/drmaa.c

@@ -3,20 +3,28 @@
 /* Slurm doesn't provide a public method to just use the local config, which we need in order to set a timeout without
  * having to contact slurmctld first... */
 extern int slurm_conf_destroy(void);
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(20,11,0)
+extern slurm_conf_t *slurm_conf_lock(void);
+#else
 extern slurm_ctl_conf_t *slurm_conf_lock(void);
+#endif
 extern void slurm_conf_unlock(void);
 
 int main(int argc, char **argv) {
 	int status = 1;
 
-	slurm_ctl_conf_t *slurm_ctl_conf_ptr = slurm_conf_lock();
-	slurm_ctl_conf_ptr->msg_timeout = 3;
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(20,11,0)
+	slurm_conf_t *slurm_conf_ptr = slurm_conf_lock();
+#else
+	slurm_ctl_conf_t *slurm_conf_ptr = slurm_conf_lock();
+#endif
+	slurm_conf_ptr->msg_timeout = 3;
 	slurm_conf_unlock();
 
 #if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(18,8,0)
 	for (uint32_t i = 1; i < 2; i++) {
 #else
-	for (uint32_t i = 0; i < slurm_ctl_conf_ptr->control_cnt; i++) {
+	for (uint32_t i = 0; i < slurm_conf_ptr->control_cnt; i++) {
 #endif
 		printf("slurm_ping(%i) == %i\n", i, slurm_ping(i));
 		if (slurm_ping(i) == SLURM_SUCCESS) {