Fixed test pipelines according to latest pipeline-library
Fixed Tempest pipeline:
* added SET, CONCURRENCY parameter
* removed deleting Docker container because for Tempest it is
run with `docker run --rm`
Fixed Rally pipeline:
* remove docker container by its name because the command with
grepping by the image name. Fixed this in pipeline library also
in https://gerrit.mcp.mirantis.net/#/c/11793/
Change-Id: I4a8fd7dd40a886134727556bf19e8ae409f55c75
diff --git a/test-run-rally.groovy b/test-run-rally.groovy
index d92d988..71e5f8b 100644
--- a/test-run-rally.groovy
+++ b/test-run-rally.groovy
@@ -9,6 +9,7 @@
* IMAGE_LINK Link to docker image with Rally
* RALLY_SCENARIO Rally test scenario
* TEST_TARGET Salt target for Rally node
+ * CONTAINER_NAME Name of the Docker container which runs Rally
* CLEANUP_REPORTS_AND_CONTAINER Cleanup reports from rally,tempest container, remove all containers started the IMAGE_LINK
* DO_CLEANUP_RESOURCES If "true": runs clean-up script for removing Rally and Tempest resources
*/
@@ -52,7 +53,7 @@
if (CLEANUP_REPORTS_AND_CONTAINER.toBoolean()) {
stage('Cleanup reports and container') {
test.removeReports(pepperEnv, TEST_TARGET, "rally_reports", 'rally_reports.tar')
- test.removeDockerContainer(pepperEnv, TEST_TARGET, IMAGE_LINK)
+ test.removeDockerContainer(pepperEnv, TEST_TARGET, CONTAINER_NAME)
}
}
}