Use Pepper instead of sending http request from jenkins master
Change-Id: I2ddfe19ae9c70731989da7ba07fa7720da797721
diff --git a/test-run-tempest.groovy b/test-run-tempest.groovy
index 4785992..9da8b16 100644
--- a/test-run-tempest.groovy
+++ b/test-run-tempest.groovy
@@ -17,19 +17,15 @@
common = new com.mirantis.mk.Common()
salt = new com.mirantis.mk.Salt()
test = new com.mirantis.mk.Test()
+def python = new com.mirantis.mk.Python()
-// Define global variables
-def saltMaster
+def pepperEnv = "pepperEnv"
node("python") {
try {
- //
- // Prepare connection
- //
- stage ('Connect to salt master') {
- // Connect to Salt master
- saltMaster = salt.connection(SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
+ stage('Setup virtualenv for Pepper') {
+ python.setupPepperVirtualenv(venvPepper, SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
}
//
@@ -37,14 +33,14 @@
//
stage('Run OpenStack Tempest tests') {
- test.runTempestTests(saltMaster, IMAGE_LINK, TEST_TARGET, TEST_TEMPEST_PATTERN, "/home/rally/rally_reports/",
+ test.runTempestTests(pepperEnv, IMAGE_LINK, TEST_TARGET, TEST_TEMPEST_PATTERN, "/home/rally/rally_reports/",
DO_CLEANUP_RESOURCES)
}
stage('Copy test reports') {
- test.copyTempestResults(saltMaster, TEST_TARGET)
+ test.copyTempestResults(pepperEnv, TEST_TARGET)
}
stage('Archiving test artifacts') {
- test.archiveRallyArtifacts(saltMaster, TEST_TARGET)
+ test.archiveRallyArtifacts(pepperEnv, TEST_TARGET)
}
} catch (Throwable e) {
currentBuild.result = 'FAILURE'
@@ -52,8 +48,8 @@
} finally {
if (CLEANUP_REPORTS_AND_CONTAINER.toBoolean()) {
stage('Cleanup reports and container') {
- test.removeReports(saltMaster, TEST_TARGET, "rally_reports", 'rally_reports.tar')
- test.removeDockerContainer(saltMaster, TEST_TARGET, IMAGE_LINK)
+ test.removeReports(pepperEnv, TEST_TARGET, "rally_reports", 'rally_reports.tar')
+ test.removeDockerContainer(pepperEnv, TEST_TARGET, IMAGE_LINK)
}
}
}