Add option -L for curl to handle redirects
Related-PROD: RE-3325
Change-Id: Ie1c3185eb566ee94f99408d6f378bb3b7811c9ad
diff --git a/src/com/mirantis/mcp/MCPArtifactory.groovy b/src/com/mirantis/mcp/MCPArtifactory.groovy
index 881e44a..acb01b6 100644
--- a/src/com/mirantis/mcp/MCPArtifactory.groovy
+++ b/src/com/mirantis/mcp/MCPArtifactory.groovy
@@ -153,7 +153,7 @@
def storageUrl = "${artifactoryURL}/api/storage/${sourcePath}"
def storageResult = sh(script: """
set +e
- response=\$(curl -s -w "\\n%{http_code}" -X GET -u \${ARTIFACTORY_LOGIN}:\${ARTIFACTORY_PASSWORD} '${storageUrl}' 2>&1)
+ response=\$(curl -sL -w "\\n%{http_code}" -X GET -u \${ARTIFACTORY_LOGIN}:\${ARTIFACTORY_PASSWORD} '${storageUrl}' 2>&1)
echo "\$response"
""", returnStdout: true).trim()
@@ -252,7 +252,7 @@
def storageUrl = "${artifactoryURL}/api/storage/${sourcePath}"
def storageResult = sh(script: """
set +e
- response=\$(curl -s -w "\\n%{http_code}" -X GET -u \${ARTIFACTORY_LOGIN}:\${ARTIFACTORY_PASSWORD} '${storageUrl}' 2>&1)
+ response=\$(curl -sL -w "\\n%{http_code}" -X GET -u \${ARTIFACTORY_LOGIN}:\${ARTIFACTORY_PASSWORD} '${storageUrl}' 2>&1)
echo "\$response"
""", returnStdout: true).trim()
@@ -290,7 +290,7 @@
def deployResult = sh(script: """
set +e
- response=\$(curl -s -w "\\n%{http_code}" -X PUT -u \${ARTIFACTORY_LOGIN}:\${ARTIFACTORY_PASSWORD} ${curlHeaders} '${deployUrl}' 2>&1)
+ response=\$(curl -sL -w "\\n%{http_code}" -X PUT -u \${ARTIFACTORY_LOGIN}:\${ARTIFACTORY_PASSWORD} ${curlHeaders} '${deployUrl}' 2>&1)
echo "\$response"
""", returnStdout: true).trim()
@@ -323,7 +323,7 @@
passwordVariable: 'ARTIFACTORY_PASSWORD',
usernameVariable: 'ARTIFACTORY_LOGIN']
]) {
- def result = sh(script: "bash -c \"curl -X GET -u \${ARTIFACTORY_LOGIN}:\${ARTIFACTORY_PASSWORD} '${storageUrl}'\"",
+ def result = sh(script: "bash -c \"curl -L -X GET -u \${ARTIFACTORY_LOGIN}:\${ARTIFACTORY_PASSWORD} '${storageUrl}'\"",
returnStdout: true).trim()
def storageInfo = new groovy.json.JsonSlurperClassic().parseText(result)