f

redhat-cop · Jun 26, 2018 · 5b9227b · 5b9227b
1 parent 5b61087
commit 5b9227b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cucumber-selenium-grid/Jenkinsfile b/cucumber-selenium-grid/Jenkinsfile
@@ -128,7 +128,7 @@ pipeline {
         dir ("${CONTEXT_DIR}"){
          //sh "/bin/bash -c 'echo selenuim url: ${SELENIUM_URL} , app base path: ${APP_BASE_PATH}'"
          sh "/bin/bash -c 'npm install'"                            
-         sh "/bin/bash -c 'SELENIUM_URL=http://zalenium.${STAGE2}.svc:4444/wd/hub APP_BASE_PATH=http://${APP_NAME}-${STAGE2}.${env.BASE_APP_DOMAIN}/#! npm run integration-test'"                          
+         sh "/bin/bash -c './node_modules/protractor/bin/protractor ./integration-tests/protractor-conf.js --selenuimAddress=http://zalenium.${STAGE2}.svc:4444/wd/hub --baseUrl=http://${APP_NAME}-${STAGE2}.${env.BASE_APP_DOMAIN}/#!'"                          
        }           
      }
      post {

diff --git a/cucumber-selenium-grid/README1.md b/cucumber-selenium-grid/README1.md
@@ -1,7 +1,7 @@
 setup
 ```
 oc process -f applier/projects/projects.yml | oc apply -f -
-oc process openshift//jenkins-ephemeral | oc apply -f- -n todomvc-build
+oc process openshift//jenkins-ephemeral JENKINS_JAVA_OVERRIDES=-Dhudson.model.DirectoryBrowserSupport.CSP= | oc apply -f- -n todomvc-build
 oc new-build --strategy docker --name jenkins-slave-nodejs8 --context-dir cucumber-selenium-grid/nodejs-slave https://github.com/raffaelespazzoli/container-pipelines#selenium -n todomvc-build 
 oc process -f applier/templates/deployment.yml --param-file=applier/params/deployment-dev | oc apply -f-
 oc process -f applier/templates/deployment.yml --param-file=applier/params/deployment-stage | oc apply -f-