Merge branch 'testable_staging' into 'staging'

re-enable tests

See merge request !66

.gitlab-ci.yml

@@ -84,8 +84,8 @@ build-master-staging:
     - IMAGE_8="$CI_REGISTRY_IMAGE/pvs_shibauth"
     - docker pull "$IMAGE_8":"$TAG_USED" || true
     - docker build --cache-from "$IMAGE_8":latest -t "$IMAGE_8":dev -t "$IMAGE_8":"$TAG_USED" shibauth/
-    # - cd ./testing && ./gitlab_test.sh
-    # - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
+    - cd ./testing && ./gitlab_test.sh
+    - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
     # - cd -
     - docker push "$IMAGE_1":"$TAG_USED"
     - docker push "$IMAGE_2":"$TAG_USED"
@@ -140,8 +140,8 @@ build:
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_shibauth"
     - docker pull "$IMAGE":staging || true
     - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev shibauth/
-    # - cd ./testing && ./gitlab_test.sh
-    # - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
+    - cd ./testing && ./gitlab_test.sh
+    - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
   except:
     - tags
     - staging