Merge pull request #51 from Conjur-Enterprise/include-openshift-port

 CNJR-0000: Update summon vars for 'oldest' OCP environment

Author: gl-johnson

Jenkinsfile

@@ -252,17 +252,6 @@ pipeline {
         }
 
         stage ("DAP Integration Tests on OpenShift oldest/next") {
-          when {
-            // Run integration tests against OpenShift only on the main branch
-            //
-            // There's been a lot of flakiness around OpenShift, which has the negative effect of impeding developer velocity.
-            // Generally speaking the integration tests for this repository interact with the generic Kubernetes API, for
-            // scheduling and giving identity to workloads. There is no platform-specifc functionality within the secrets provider.
-            // We can reasonably assume that if a branch is green in GKE then it will likely be green for OpenShift.
-            // With that in mind, for now we have chosen to run Openshift integration tests only on the main branch while we figure
-            // out a better way to address the flakiness.
-            branch 'main'
-          }
           steps {
             script {
               def tasks = [:]

deploy/summon/secrets.yml

@@ -34,16 +34,18 @@ gke:
 
 oldest:
   OPENSHIFT_VERSION: !var ci/openshift/oldest/version
-  OPENSHIFT_URL: !var ci/openshift/oldest/hostname
+  OPENSHIFT_URL: !var ci/openshift/oldest/api-url
   OPENSHIFT_USERNAME: !var ci/openshift/oldest/username
   OPENSHIFT_PASSWORD: !var ci/openshift/oldest/password
+  OSHIFT_CLUSTER_ADMIN_USERNAME: !var ci/openshift/oldest/username
+  OSHIFT_CONJUR_ADMIN_USERNAME: !var ci/openshift/oldest/username
 
   PLATFORM: openshift
   TEST_PLATFORM: openshift
   DOCKER_REGISTRY_URL: !var ci/openshift/oldest/registry-url
   DOCKER_REGISTRY_PATH: !var ci/openshift/oldest/registry-url
-  PULL_DOCKER_REGISTRY_URL: !var ci/openshift/oldest/registry-url
-  PULL_DOCKER_REGISTRY_PATH: !var ci/openshift/oldest/registry-url
+  PULL_DOCKER_REGISTRY_URL: !var ci/openshift/oldest/internal-registry-url
+  PULL_DOCKER_REGISTRY_PATH: !var ci/openshift/oldest/internal-registry-url
 
 current:
   OPENSHIFT_VERSION: !var ci/openshift/current/version