commit 3754a90cb3184d7e4ff5f9349cd139525b7eabd4
author Tatyana Leontovich <tleontovich@mirantis.com> Fri Jan 20 18:48:55 2017 +0200
committer Tatyana Leontovich <tleontovich@mirantis.com> Mon Jan 23 16:31:33 2017 +0200
tree 315bf9e33d01beb0e290dd059e61598edfb12f70
parent e4f522fcd92a32091416e4466b8468c5f3a448e7

Add conformance tests stage

Change-Id: I9048c6c09f54df99d7f44209e719dea2fde39ad4

mk-k8s-mcp-oc-deploy-pipeline.groovy

diff --git a/mk-k8s-mcp-oc-deploy-pipeline.groovy b/mk-k8s-mcp-oc-deploy-pipeline.groovy
index ec007ed..33b8c95 100644
--- a/mk-k8s-mcp-oc-deploy-pipeline.groovy
+++ b/mk-k8s-mcp-oc-deploy-pipeline.groovy
@@ -17,6 +17,8 @@
  *   HEAT_STACK_ENVIRONMENT     Heat stack environmental parameters
  *   HEAT_STACK_ZONE            Heat stack availability zone
  *   HEAT_STACK_PUBLIC_NET      Heat stack floating IP pool
+ *   CONFORMANCE_IMAGE          Path to docker image with conformance e2e tests
+ *   K8S_API_SERVER             Kubernetes API address
  */
 
 git = new com.mirantis.mk.git()
@@ -81,6 +83,10 @@
         salt.installOpenstackMcpCompute(saltMaster)
     }
 
+    stage("Run k8s conformance e2e tests") {
+        salt.runConformanceTest(saltMaster, K8S_API_SERVER, CONFORMANCE_IMAGE)
+    }
+
     if (HEAT_STACK_DELETE == "1") {
         stage('Trigger cleanup job') {
             build job: 'mk-k8s-cleanup', parameters: [[$class: 'StringParameterValue', name: 'HEAT_STACK_NAME', value: HEAT_STACK_NAME]]

mk-k8s-simple-deploy-pipeline.groovy

diff --git a/mk-k8s-simple-deploy-pipeline.groovy b/mk-k8s-simple-deploy-pipeline.groovy
index b624aff..a6f9938 100644
--- a/mk-k8s-simple-deploy-pipeline.groovy
+++ b/mk-k8s-simple-deploy-pipeline.groovy
@@ -17,6 +17,8 @@
  *   HEAT_STACK_ENVIRONMENT     Heat stack environmental parameters
  *   HEAT_STACK_ZONE            Heat stack availability zone
  *   HEAT_STACK_PUBLIC_NET      Heat stack floating IP pool
+ *   CONFORMANCE_IMAGE          Path to docker image with conformance e2e tests
+ *   K8S_API_SERVER             Kubernetes API address
  */
 
 git = new com.mirantis.mk.git()
@@ -81,6 +83,10 @@
     //    salt.installOpenstackMcpCompute(saltMaster)
     //}
 
+    stage("Run k8s conformance e2e tests") {
+        salt.runConformanceTest(saltMaster, K8S_API_SERVER, CONFORMANCE_IMAGE)
+    }
+
     if (HEAT_STACK_DELETE == "1") {
         stage('Trigger cleanup job') {
             build job: 'mk-k8s-cleanup', parameters: [[$class: 'StringParameterValue', name: 'HEAT_STACK_NAME', value: HEAT_STACK_NAME]]

mk-kubernetes-deploy-pipeline.groovy

diff --git a/mk-kubernetes-deploy-pipeline.groovy b/mk-kubernetes-deploy-pipeline.groovy
index 25d3298..fa77110 100644
--- a/mk-kubernetes-deploy-pipeline.groovy
+++ b/mk-kubernetes-deploy-pipeline.groovy
@@ -17,6 +17,8 @@
  *   HEAT_STACK_ENVIRONMENT     Heat stack environmental parameters
  *   HEAT_STACK_ZONE            Heat stack availability zone
  *   HEAT_STACK_PUBLIC_NET      Heat stack floating IP pool
+ *   CONFORMANCE_IMAGE          Path to docker image with conformance e2e tests
+ *   K8S_API_SERVER             Kubernetes API address
  */
 
 git = new com.mirantis.mk.git()
@@ -77,6 +79,10 @@
         salt.installOpenstackMcpCompute(saltMaster)
     }
 
+    stage("Run k8s conformance e2e tests") {
+        salt.runConformanceTest(saltMaster, K8S_API_SERVER, CONFORMANCE_IMAGE)
+    }
+
     //stage('Delete Heat stack') {
     //    openstack.deleteHeatStack(openstackCloud, HEAT_STACK_NAME, openstackEnv)
     //}