Merged in feature/SHIBUI-1333-QA (pull request #349)

Feature/SHIBUI-1333 QA Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Aug 1, 2019 · b8207c7 · b8207c7
2 parents 8620d6e + 8a6b057
commit b8207c7
Show file tree

Hide file tree

Showing 4 changed files with 1,973 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
     stage('Run Selenium tests') {
       when {
         expression {
-          return GIT_BRANCH.startsWith('PR')
+          return (GIT_BRANCH.startsWith('PR') || GIT_BRANCH.endsWith('-QA'))
         }
       }
       steps {

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -7,4 +7,4 @@ COPY loader.properties loader.properties
 
 EXPOSE 8080
 
-ENTRYPOINT ["/usr/bin/java", "-jar", "app.jar"]
+ENTRYPOINT ["/usr/bin/java", "-jar", "app.jar"]
diff --git a/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -111,6 +111,7 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-950: Metadata Source from XML w/ digest'    | '/SHIBUI-950.side'
         'SHIBUI-1352: Create LocalDynamic provider'         | '/SHIBUI-1352-1.side'
         'SHIBUI-1352: Create FileSystem provider'           | '/SHIBUI-1352-2.side'
+        'SHIBUI-1333: Verify metadata source configuration' | '/SHIBUI-1333.side'
     }
 }