f

redhat-cop · Jun 14, 2018 · ec8fde3 · ec8fde3
1 parent e668943
commit ec8fde3
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 21 deletions.
diff --git a/cucumber-selenium-grid/.gitignore b/cucumber-selenium-grid/.gitignore
@@ -0,0 +1 @@
+/npm-debug.log
diff --git a/cucumber-selenium-grid/Jenkinsfile b/cucumber-selenium-grid/Jenkinsfile
@@ -45,7 +45,6 @@ pipeline {
         // Turn off Git's SSL cert check, uncomment if needed
         // sh 'git config --global http.sslVerify false'
         git url: "${APPLICATION_SOURCE_REPO}"
-        stash 'source'
       }
     }
 
@@ -143,20 +142,36 @@ pipeline {
         dir ("${CONTEXT_DIR}"){
          sh "/bin/bash -c 'npm install'"                   
          sh "/bin/bash -c 'npm run integration-test'"
-    //        script {            
-    //          archive (includes: 'pkg/*.gem')
-    //          publishHTML (target: [
-    //            allowMissing: false,
-    //            alwaysLinkToLastBuild: false,
-    //            keepAll: true,
-    //            reportDir: 'coverage',
-    //            reportFiles: 'index.html',
-    //            reportName: "RCov Report"
-    //          ])
-    //        }                           
-      }           
-        }
-
+//         script {            
+//           archive (includes: 'cucumber/*')
+//           publishHTML (target: [
+//             allowMissing: false,
+//             alwaysLinkToLastBuild: false,
+//             keepAll: true,
+//             reportDir: 'report',
+//             reportFiles: 'index.html',
+//             reportName: "Cucumber Report"
+//           ])
+//         }                           
+       }           
+     }
+     post {
+       always {
+         dir ("${CONTEXT_DIR}"){
+           script {            
+             archive (includes: 'cucumber/*')
+             publishHTML (target: [
+               allowMissing: false,
+               alwaysLinkToLastBuild: false,
+               keepAll: true,
+               reportDir: 'report',
+               reportFiles: 'index.html',
+               reportName: "Cucumber Report"
+             ])
+           }
+         }
+       }
+     }
 
 
     }

diff --git a/cucumber-selenium-grid/applier/templates/selenium-grid.yaml b/cucumber-selenium-grid/applier/templates/selenium-grid.yaml
@@ -82,7 +82,7 @@ objects:
             args:
               - start
               - '--desiredContainers'
-              - '0'
+              - '2'
               - '--screenWidth'
               - '1440'
               - '--screenHeight'
@@ -127,14 +127,12 @@ objects:
   kind: Route
   metadata:
     annotations:
-    labels:
-      application: todomvc
-      template: basic-nodejs
-    name: todomvc
+    name: zalenium
+    namespace: ${NAMESPACE}
   spec:
     to:
       kind: Service
-      name: todomvc
+      name: zalenium
 - apiVersion: v1
   kind: PersistentVolumeClaim
   metadata: