Adding parameter to runConformanceTests method
- Propageted parameter target ('ctl01*') to runConformanceTests method
- Depends on https://gerrit.mcp.mirantis.net/#/c/10795/
Change-Id: Ib64759003b0deb0dd75ab103c7bfd1e25b14c17f
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 4195d13..99cbe23 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -416,7 +416,7 @@
def output_file = image.replaceAll('/', '-') + '.output'
// run image
- test.runConformanceTests(saltMaster, TEST_K8S_API_SERVER, image)
+ test.runConformanceTests(saltMaster, 'ctl01*', TEST_K8S_API_SERVER, image)
// collect output
sh "mkdir -p ${artifacts_dir}"
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index c605421..06dc48e 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -295,7 +295,7 @@
def output_file = image.replaceAll('/', '-') + '.output'
// run image
- test.runConformanceTests(saltMaster, TEST_K8S_API_SERVER, image)
+ test.runConformanceTests(saltMaster, 'ctl01*', TEST_K8S_API_SERVER, image)
// collect output
sh "mkdir -p ${artifacts_dir}"
@@ -308,13 +308,13 @@
}
stage('Run k8s conformance e2e tests') {
- //test.runConformanceTests(saltMaster, TEST_K8S_API_SERVER, TEST_K8S_CONFORMANCE_IMAGE)
+ //test.runConformanceTests(saltMaster, 'ctl01*', TEST_K8S_API_SERVER, TEST_K8S_CONFORMANCE_IMAGE)
def image = TEST_K8S_CONFORMANCE_IMAGE
def output_file = image.replaceAll('/', '-') + '.output'
// run image
- test.runConformanceTests(saltMaster, TEST_K8S_API_SERVER, image)
+ test.runConformanceTests(saltMaster, 'ctl01*', TEST_K8S_API_SERVER, image)
// collect output
sh "mkdir -p ${artifacts_dir}"
diff --git a/mk-k8s-simple-deploy-pipeline.groovy b/mk-k8s-simple-deploy-pipeline.groovy
index b86e6da..b0aca53 100644
--- a/mk-k8s-simple-deploy-pipeline.groovy
+++ b/mk-k8s-simple-deploy-pipeline.groovy
@@ -89,11 +89,11 @@
if (RUN_TESTS == "1") {
sleep(30)
stage('Run k8s bootstrap tests') {
- test.runConformanceTests(saltMaster, K8S_API_SERVER, 'tomkukral/k8s-scripts')
+ test.runConformanceTests(saltMaster, 'ctl01*', K8S_API_SERVER, 'tomkukral/k8s-scripts')
}
stage("Run k8s conformance e2e tests") {
- test.runConformanceTests(saltMaster, K8S_API_SERVER, CONFORMANCE_IMAGE)
+ test.runConformanceTests(saltMaster, 'ctl01*', K8S_API_SERVER, CONFORMANCE_IMAGE)
}
stage("Copy k8s e2e test output to config node ") {
diff --git a/test-service.groovy b/test-service.groovy
index f7cdd64..232b386 100644
--- a/test-service.groovy
+++ b/test-service.groovy
@@ -46,7 +46,7 @@
def output_file = image.replaceAll('/', '-') + '.output'
// run image
- test.runConformanceTests(saltMaster, TEST_K8S_API_SERVER, image)
+ test.runConformanceTests(saltMaster, 'ctl01*', TEST_K8S_API_SERVER, image)
// collect output
sh "mkdir -p ${artifacts_dir}"
@@ -63,7 +63,7 @@
def output_file = image.replaceAll('/', '-') + '.output'
// run image
- test.runConformanceTests(saltMaster, TEST_K8S_API_SERVER, image)
+ test.runConformanceTests(saltMaster, 'ctl01*', TEST_K8S_API_SERVER, image)
// collect output
sh "mkdir -p ${artifacts_dir}"