Merge branch 'master' into release/1.Y

Author: robertodr

ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE.md

@@ -28,7 +28,7 @@
 *.app
 
 # Build directories
-*build*
+*build*/
 
 # Python stuff
 *.pyc

PULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,25 @@
 before_script:
-    - ls -la
-    - apt-get update -y
-    - apt-get install gcc g++ gfortran make cmake zlib1g-dev python-dateutil python-pyparsing python-numpy python-matplotlib python-pip python-setuptools python-dev -y
-gcc_debug:
-    script:
-        - "python setup.py --cxx=g++ --cc=gcc --fc=gfortran --type=debug"
-        - cd build
-        - make
-        - ctest
-gcc_debug_nocxx11:
-    script:
-        - "python setup.py --cxx=g++ --cc=gcc --fc=gfortran --type=debug --cmake-options='-DENABLE_CXX11_SUPPORT=OFF'"
-        - cd build
-        - make
-        - ctest
+  - ls -la
+  - apt-get update -y
+  - apt-get install cmake zlib1g-dev libboost-all-dev python-dateutil python-pyparsing python-numpy python-matplotlib python-pip python-setuptools python-dev -y
+  - python -V
+  - cmake --version
+  - g++ --version
+  - gcc --version
+  - gfortran --version
+
+variables:
+  CTEST_COMMAND: "ctest --parallel 2 --output-on-failure --verbose --dashboard Experimental --track GitLabCI"
+
+gcc:
+  image: gcc:5.4
+  script:
+    - python setup.py --cxx=g++ --cc=gcc --fc=gfortran --type=release
+    - cd build
+    - ../.scripts/ci_build.sh
+    - python ../.scripts/ci_test.py ${CTEST_COMMAND}
+    - python ../.scripts/ci_print_failing.py
+  artifacts:
+    paths:
+      - build.log
+      - full_ctest_output.dat

.gitignore

@@ -0,0 +1,35 @@
+<!--- Provide a general summary of the issue in the Title above -->
+<!--- Use labels to help the developers -->
+<!--- Remove the unnecessary sections when filing -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Environment name and version (e.g. PHP 5.4 on nginx 1.9.1):
+* Server type and version:
+* Operating System and version:
+* Link to your project:

.gitlab-ci.yml

@@ -0,0 +1,42 @@
+<!--- Provide a general summary of your changes in the Title above -->
+<!--- Use labels to help the developers -->
+<!--- Remove the unnecessary sections when filing -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):
+
+## Todos
+<!--- Notable points that this PR has either accomplished or will accomplish. -->
+* **Developer Interest**
+<!--- Changes affecting developers -->
+  - [ ] Feature1
+* **User-Facing for Release Notes**
+<!--- Changes affecting users -->
+  - [ ] Feature2
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## Questions
+<!--- Questions to the developers -->
+- [ ]  Question1
+
+## Status
+<!--- Check this box when ready to be merged -->
+- [ ]  Ready to go
+
+

.gitlab/ISSUE_TEMPLATE.md

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# The return code will capture an error from ANY of the functions in the pipe
+set -o pipefail
+cmake --build . -- --jobs=2 VERBOSE=1 | tee build.log | grep "Building"
+RESULT=$?
+
+if [ $RESULT -eq 0 ]; then
+  echo build succeeded
+else
+  echo build failed
+  cat build.log
+  exit 1
+fi

.gitlab/MERGE_REQUEST_TEMPLATE.md

@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+import re
+import sys
+
+badtests = []
+testfail = re.compile(r'^\s*(?P<num>\d+) - (?P<name>\w+(?:-\w+)*) \(Failed\)\s*$')
+
+with open('full_ctest_output.dat', 'r') as outfile:
+    ctestout = outfile.readlines()
+
+ctest_exit_status = int(ctestout[0])
+if len(ctestout[1:]) == 0:
+    sys.stdout.write('\n  <<<  All test cases have passed!  >>>\n\n')
+else:
+    sys.stdout.write('\n  <<<  Failing outputs follow.  >>>\n\n')
+
+for line in ctestout[1:]:
+    linematch = testfail.match(line)
+    if linematch:
+        bad = linematch.group('name')
+        sys.stdout.write('\n\n {} failed. Here is the output:\n'.format(bad))
+
+        badoutfile = 'tests/' + bad + '.log'
+
+        with open(badoutfile, 'r') as ofile:
+            sys.stdout.write(ofile.read())
+
+# <<<  return ctest error code  >>>
+sys.exit(ctest_exit_status)

.scripts/ci_build.sh

@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+import sys
+import time
+import subprocess
+
+def run_ctest(command):
+    """
+    Execute CTest command
+    """
+    return subprocess.Popen(command,
+                            bufsize=0,
+                            stdout=subprocess.PIPE,
+                            universal_newlines=True)
+
+ctest_command = sys.argv[1:]
+print("CTest command \"{}\"".format(' '.join(ctest_command)))
+retcode = run_ctest(ctest_command)
+print_all = False
+ctestout = ''
+while True:
+    data = retcode.stdout.readline()
+#    print(data.split())
+    if not data:
+        break
+
+    if '% tests passed,' in data:
+        print_all = True
+
+    sdata = data.split()
+    test_line = ('Test' in sdata) and ('sec' in sdata)
+    start_line = ('Start' in sdata)
+    if test_line or start_line or print_all:
+        sys.stdout.write(data)  # screen
+    #print sys.stdout.write(data)
+    ctestout += data  # string
+
+while True:
+    retcode.poll()
+    exstat = retcode.returncode
+    if exstat is not None:
+        ctest_exit_status = exstat
+        break
+    time.sleep(0.1)
+
+# <<<  identify failed tests and cat their output  >>>
+sys.stdout.write("""\n  <<<  CTest complete with status %d.  >>>\n\n""" %
+                 (ctest_exit_status))
+
+ctestout = str(ctest_exit_status) + "\n" + ctestout
+
+with open('full_ctest_output.dat', 'w') as outfile:
+    outfile.write(ctestout)

.scripts/ci_print_failing.py

@@ -349,8 +349,10 @@ before_script:
 - ${Fortran_COMPILER} --version
 - python setup.py --cxx=${CXX_COMPILER} --cc=${C_COMPILER} --fc=${Fortran_COMPILER} --type=${BUILD_TYPE} --cmake-options='-Hprojects/CMake' ${STATIC} ${COVERAGE}
 - cd build
+- ../.scripts/ci_build.sh
 script:
-- ctest --parallel 2 --output-on-failure --verbose --dashboard Experimental --track TravisCI
+- python ../.scripts/ci_test.py ctest --parallel 2 --output-on-failure --verbose --dashboard Experimental --track TravisCI
+- python ../.scripts/ci_print_failing.py
 after_success:
 - |
   if [[ "${COVERAGE}" = true ]]; then