From aa8c102b1b77b94a65045c05f7960cbb0c60468c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Fri, 5 Apr 2019 10:55:42 +0200
Subject: [PATCH] [skip travis] whitelist
 threescale_cicd_create_default_application in supports + minor fixes

---
 support/docker/deploy-api.yaml                  |  1 +
 support/jenkins/Jenkinsfile                     |  1 +
 support/jenkins/deploy-3scale-api-pipeline.yaml | 15 ---------------
 support/kubernetes/job.yaml                     |  2 ++
 support/openshift/openshift-template.yaml       |  9 ++++++++-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/support/docker/deploy-api.yaml b/support/docker/deploy-api.yaml
index b1a5e4c..9c0d182 100644
--- a/support/docker/deploy-api.yaml
+++ b/support/docker/deploy-api.yaml
@@ -91,6 +91,7 @@
     - threescale_cicd_apicast_sandbox_endpoint
     - threescale_cicd_apicast_production_endpoint
     - threescale_cicd_sso_issuer_endpoint
+    - threescale_cicd_create_default_application
   pre_tasks:
   - name: Accept threescale_cicd_* variables from environment variables (lowercase)
     set_fact:
diff --git a/support/jenkins/Jenkinsfile b/support/jenkins/Jenkinsfile
index 260b574..a2ddd45 100644
--- a/support/jenkins/Jenkinsfile
+++ b/support/jenkins/Jenkinsfile
@@ -34,6 +34,7 @@ pipeline {
         // Misc. params
         booleanParam(name: 'THREESCALE_CICD_VALIDATE_OPENAPI', description: 'Validates the OpenAPI Specification file against the official schema', defaultValue: true)
         booleanParam(name: 'ANSIBLE_VERBOSE', description: 'Run Ansible in verbose mode (-v)', defaultValue: false)
+        booleanParam(name: 'THREESCALE_CICD_CREATE_DEFAULT_APPLICATION', description: 'Create a test application with the default application plan, whether smoke tests are enabled or not', defaultValue: true)
     }
 
     stages {
diff --git a/support/jenkins/deploy-3scale-api-pipeline.yaml b/support/jenkins/deploy-3scale-api-pipeline.yaml
index a72fd3e..eb24601 100644
--- a/support/jenkins/deploy-3scale-api-pipeline.yaml
+++ b/support/jenkins/deploy-3scale-api-pipeline.yaml
@@ -27,18 +27,3 @@ objects:
       type: "JenkinsPipeline"
       jenkinsPipelineStrategy:
         jenkinsfilePath: support/jenkins/Jenkinsfile
-        env:
-          - name: THREESCALE_CICD_ACCESS_TOKEN
-            value: 
-          - name: THREESCALE_CICD_SSO_ISSUER_ENDPOINT
-            value: 
-          - name: THREESCALE_PORTAL_HOSTNAME
-            value: 
-          - name: GIT_REPOSITORY
-            value: 
-          - name: GIT_BRANCH
-            value: 
-          - name: OPENAPI_FILE
-            value: 
-          - name: THREESCALE_CICD_PRIVATE_BASE_URL
-            value: 
\ No newline at end of file
diff --git a/support/kubernetes/job.yaml b/support/kubernetes/job.yaml
index 3a176e3..6a47b1a 100644
--- a/support/kubernetes/job.yaml
+++ b/support/kubernetes/job.yaml
@@ -43,6 +43,8 @@ items:
             value: ""
           - name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT
             value: ""
+          - name: THREESCALE_CICD_CREATE_DEFAULT_APPLICATION
+            value: "true"
           volumeMounts:
           - name: 3scale-secrets
             mountPath: /tmp/secrets
diff --git a/support/openshift/openshift-template.yaml b/support/openshift/openshift-template.yaml
index 480cfea..464bec7 100644
--- a/support/openshift/openshift-template.yaml
+++ b/support/openshift/openshift-template.yaml
@@ -55,6 +55,7 @@ parameters:
 - name: THREESCALE_CICD_API_BASE_SYSTEM_NAME
   description: Define the base name to compute the final system_name
   required: false
+  value: api
 - name: THREESCALE_CICD_WILDCARD_DOMAIN
   description: Automatically defines the APIcast public URLs based on a scheme
   required: false
@@ -82,6 +83,10 @@ parameters:
 - name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT
   description: Defines the Public Production Base URL
   required: false
+- name: THREESCALE_CICD_CREATE_DEFAULT_APPLICATION
+  description: Create a test application with the default application plan, whether smoke tests are enabled or not
+  required: false
+  value: "true"
 
 objects:
 - apiVersion: v1
@@ -129,7 +134,7 @@ objects:
         - name: OPENAPI_FILE
           value: ${API_OPENAPI_FILE}
         - name: THREESCALE_CICD_API_BASE_SYSTEM_NAME
-          value: ${API_NAME}
+          value: ${THREESCALE_CICD_API_BASE_SYSTEM_NAME}
         - name: THREESCALE_CICD_API_SYSTEM_NAME
           value: ${THREESCALE_CICD_API_SYSTEM_NAME}
         - name: THREESCALE_CICD_WILDCARD_DOMAIN
@@ -150,6 +155,8 @@ objects:
           value: ${THREESCALE_CICD_APICAST_SANDBOX_ENDPOINT}
         - name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT
           value: ${THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT}
+        - name: THREESCALE_CICD_CREATE_DEFAULT_APPLICATION
+          value: ${THREESCALE_CICD_CREATE_DEFAULT_APPLICATION}
         secrets:
           - secretSource: 
               name: "3scale-admin-portal-${API_NAME}"