diff --git a/Jenkinsfile b/Jenkinsfile index bb36e9c..8390cb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,6 +47,7 @@ node('nodejs') { srcStream: params.OPENSHIFT_IMAGE_STREAM, srcTag: 'latest', verbose: 'false' } + stage('Deploy API to test') { // Tag the new build as "ready-for-test" openshiftTag alias: 'false', destStream: params.OPENSHIFT_IMAGE_STREAM, srcTag: "${newVersion}", @@ -63,6 +64,14 @@ node('nodejs') { extraVars: JsonOutput.toJson(towerExtraVars) } + + stage('Run Integration Tests') { + microcksTest(apiURL: params.MICROCKS_SERVER_URL, + serviceId: params.MICROCKS_SERVICE_ID, + testEndpoint: params.MICROCKS_TEST_ENDPOINT, + runnerType: 'POSTMAN', verbose: 'true') + } + stage('Deploy API to prod') { // Tag the new build as "ready-for-prod" openshiftTag alias: 'false', destStream: params.OPENSHIFT_IMAGE_STREAM, srcTag: "${newVersion}", diff --git a/README.md b/README.md index a1b9ec1..0212207 100644 --- a/README.md +++ b/README.md @@ -232,7 +232,7 @@ threescale_cicd_wildcard_domain: prod.app.itix.fr Create the Jenkins pipeline from your forked repository: ```sh -oc process -f pipeline-template.yaml -p GIT_REPO=https://github.com/nmasse-itix/rhte-api.git |oc create -f - -n rhte-build +oc process -f pipeline-template.yaml -p GIT_REPO=https://github.com/nmasse-itix/rhte-api.git -p MICROCKS_TEST_ENDPOINT=http://$(oc get route rhte-api -n rhte-test -o jsonpath={.spec.host}) |oc create -f - -n rhte-build ``` ## 15/ Jenkins setup for Ansible Tower diff --git a/pipeline-template.yaml b/pipeline-template.yaml index c56043c..ef2582c 100644 --- a/pipeline-template.yaml +++ b/pipeline-template.yaml @@ -55,6 +55,12 @@ objects: value: ${OPENSHIFT_PROD_ENVIRONMENT} - name: OPENSHIFT_DEPLOYMENT_CONFIG value: ${OPENSHIFT_DEPLOYMENT_CONFIG} + - name: MICROCKS_SERVER_URL + value: ${MICROCKS_SERVER_URL} + - name: MICROCKS_SERVICE_ID + value: ${MICROCKS_SERVICE_ID} + - name: MICROCKS_TEST_ENDPOINT + value: ${MICROCKS_TEST_ENDPOINT} parameters: - name: GIT_REPO value: https://github.com/nmasse-itix/rhte-api.git @@ -95,3 +101,11 @@ parameters: - name: OPENSHIFT_DEPLOYMENT_CONFIG value: rhte-api required: true +- name: MICROCKS_SERVER_URL + value: http://microcks:8080/api + required: true +- name: MICROCKS_SERVICE_ID + value: RHTE-API:1.1 + required: true +- name: MICROCKS_TEST_ENDPOINT + required: true