Browse Source

[skip travis] whitelist threescale_cicd_create_default_application in supports + minor fixes

master
Nicolas Massé 7 years ago
parent
commit
aa8c102b1b
  1. 1
      support/docker/deploy-api.yaml
  2. 1
      support/jenkins/Jenkinsfile
  3. 15
      support/jenkins/deploy-3scale-api-pipeline.yaml
  4. 2
      support/kubernetes/job.yaml
  5. 9
      support/openshift/openshift-template.yaml

1
support/docker/deploy-api.yaml

@ -91,6 +91,7 @@
- threescale_cicd_apicast_sandbox_endpoint - threescale_cicd_apicast_sandbox_endpoint
- threescale_cicd_apicast_production_endpoint - threescale_cicd_apicast_production_endpoint
- threescale_cicd_sso_issuer_endpoint - threescale_cicd_sso_issuer_endpoint
- threescale_cicd_create_default_application
pre_tasks: pre_tasks:
- name: Accept threescale_cicd_* variables from environment variables (lowercase) - name: Accept threescale_cicd_* variables from environment variables (lowercase)
set_fact: set_fact:

1
support/jenkins/Jenkinsfile

@ -34,6 +34,7 @@ pipeline {
// Misc. params // Misc. params
booleanParam(name: 'THREESCALE_CICD_VALIDATE_OPENAPI', description: 'Validates the OpenAPI Specification file against the official schema', defaultValue: true) 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: '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 { stages {

15
support/jenkins/deploy-3scale-api-pipeline.yaml

@ -27,18 +27,3 @@ objects:
type: "JenkinsPipeline" type: "JenkinsPipeline"
jenkinsPipelineStrategy: jenkinsPipelineStrategy:
jenkinsfilePath: support/jenkins/Jenkinsfile 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:

2
support/kubernetes/job.yaml

@ -43,6 +43,8 @@ items:
value: "" value: ""
- name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT - name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT
value: "" value: ""
- name: THREESCALE_CICD_CREATE_DEFAULT_APPLICATION
value: "true"
volumeMounts: volumeMounts:
- name: 3scale-secrets - name: 3scale-secrets
mountPath: /tmp/secrets mountPath: /tmp/secrets

9
support/openshift/openshift-template.yaml

@ -55,6 +55,7 @@ parameters:
- name: THREESCALE_CICD_API_BASE_SYSTEM_NAME - name: THREESCALE_CICD_API_BASE_SYSTEM_NAME
description: Define the base name to compute the final system_name description: Define the base name to compute the final system_name
required: false required: false
value: api
- name: THREESCALE_CICD_WILDCARD_DOMAIN - name: THREESCALE_CICD_WILDCARD_DOMAIN
description: Automatically defines the APIcast public URLs based on a scheme description: Automatically defines the APIcast public URLs based on a scheme
required: false required: false
@ -82,6 +83,10 @@ parameters:
- name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT - name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT
description: Defines the Public Production Base URL description: Defines the Public Production Base URL
required: false 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: objects:
- apiVersion: v1 - apiVersion: v1
@ -129,7 +134,7 @@ objects:
- name: OPENAPI_FILE - name: OPENAPI_FILE
value: ${API_OPENAPI_FILE} value: ${API_OPENAPI_FILE}
- name: THREESCALE_CICD_API_BASE_SYSTEM_NAME - name: THREESCALE_CICD_API_BASE_SYSTEM_NAME
value: ${API_NAME} value: ${THREESCALE_CICD_API_BASE_SYSTEM_NAME}
- name: THREESCALE_CICD_API_SYSTEM_NAME - name: THREESCALE_CICD_API_SYSTEM_NAME
value: ${THREESCALE_CICD_API_SYSTEM_NAME} value: ${THREESCALE_CICD_API_SYSTEM_NAME}
- name: THREESCALE_CICD_WILDCARD_DOMAIN - name: THREESCALE_CICD_WILDCARD_DOMAIN
@ -150,6 +155,8 @@ objects:
value: ${THREESCALE_CICD_APICAST_SANDBOX_ENDPOINT} value: ${THREESCALE_CICD_APICAST_SANDBOX_ENDPOINT}
- name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT - name: THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT
value: ${THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT} value: ${THREESCALE_CICD_APICAST_PRODUCTION_ENDPOINT}
- name: THREESCALE_CICD_CREATE_DEFAULT_APPLICATION
value: ${THREESCALE_CICD_CREATE_DEFAULT_APPLICATION}
secrets: secrets:
- secretSource: - secretSource:
name: "3scale-admin-portal-${API_NAME}" name: "3scale-admin-portal-${API_NAME}"

Loading…
Cancel
Save