Use Pepper instead of sending http request from jenkins master
Change-Id: I2ddfe19ae9c70731989da7ba07fa7720da797721
diff --git a/docker-cleanup-pipeline.groovy b/docker-cleanup-pipeline.groovy
index 1d7b3b4..abc21d1 100644
--- a/docker-cleanup-pipeline.groovy
+++ b/docker-cleanup-pipeline.groovy
@@ -9,14 +9,17 @@
common = new com.mirantis.mk.Common()
salt = new com.mirantis.mk.Salt()
jenkinsUtils = new com.mirantis.mk.JenkinsUtils()
+def python = new com.mirantis.mk.Python()
+
+def pepperEnv = "pepperEnv"
node{
def saltMaster;
- stage("Connect to MCP 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)
}
stage("Clean old containers"){
- salt.cmdRun(saltMaster, 'I@jenkins:slave', """
+ salt.cmdRun(pepperEnv, 'I@jenkins:slave', """
docker ps --format='{{.ID}}' | xargs -n 1 -r docker inspect \\
-f '{{.ID}} {{.State.Running}} {{.State.StartedAt}}' \\
| awk '\$2 == "true" && \$3 <= "'\$(date -d '${TEST_DATE_STRING}' -Ins --utc \\
@@ -25,6 +28,6 @@
""", false)
}
stage("Run docker system prune"){
- salt.cmdRun(saltMaster, 'I@jenkins:slave', "docker system prune -f")
+ salt.cmdRun(pepperEnv, 'I@jenkins:slave', "docker system prune -f")
}
}