fixes

redhat-cop · Jun 17, 2018 · dbf7626 · dbf7626
1 parent 5295a33
commit dbf7626
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/cucumber-selenium-grid/Jenkinsfile b/cucumber-selenium-grid/Jenkinsfile
@@ -9,6 +9,9 @@ openshift.withCluster() {
   env.STAGE2 = "${projectBase}-stage"
   env.STAGE3 = "${projectBase}-prod"
   env.LABEL = "nodejs-slave-${UUID.randomUUID().toString()}"
+  env.APP_BASE_URL = "http://${APP_NAME}-${STAGE2}.${env.BASE_APP_DOMAIN}"
+  env.SELENIUM_URL = "http://zalenium.${STAGE2}.svc:4444/wd/hub"
+
 }
 
 pipeline {

diff --git a/cucumber-selenium-grid/applier/params/build-dev b/cucumber-selenium-grid/applier/params/build-dev
@@ -3,3 +3,4 @@ NAMESPACE=todomvc-build
 SOURCE_REPOSITORY_URL=https://github.com/raffaelespazzoli/container-pipelines
 SOURCE_REPOSITORY_REF=selenium
 APPLICATION_CONTEXT_DIR=examples/angularjs
+BASE_APP_DOMAIN=apps.raffa1.casl-contrib.osp.rht-labs.com
diff --git a/cucumber-selenium-grid/applier/templates/build.yml b/cucumber-selenium-grid/applier/templates/build.yml
@@ -44,7 +44,9 @@ objects:
         - name: "APPLICATION_SOURCE_REPO"
           value: "${APPLICATION_SOURCE_REPO}"
         - name: "CONTEXT_DIR"
-          value: "${APPLICATION_CONTEXT_DIR}"  
+          value: "${APPLICATION_CONTEXT_DIR}"
+        - name: "BASE_APP_DOMAIN"
+          value: "${BASE_APP_DOMAIN}"    
 - apiVersion: v1
   kind: BuildConfig
   metadata:
@@ -117,3 +119,6 @@ parameters:
   name: IMAGE_STREAM_TAG_NAME
   required: true
   value: nodejs:8
+- description: the base domain that this app will have when accessed from outside OCP
+  name: BASE_APP_DOMAIN
+  required: true