diff --git a/dockerfiles/services/sslproxy/Jenkinsfile b/dockerfiles/services/sslproxy/Jenkinsfile index a514cc9..e046942 100644 --- a/dockerfiles/services/sslproxy/Jenkinsfile +++ b/dockerfiles/services/sslproxy/Jenkinsfile @@ -21,6 +21,10 @@ pipeline { } stage('build') { + options { + ansiColor('xterm') + timeout(2) + } steps { dir(WORKDIR) { withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { @@ -32,6 +36,10 @@ pipeline { } stage('deploy') { + options { + ansiColor('xterm') + timeout(2) + } steps { dir(WORKDIR) { withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { diff --git a/dockerfiles/services/sslproxy/cli/build b/dockerfiles/services/sslproxy/cli/build index 14012d8..f5f3586 100755 --- a/dockerfiles/services/sslproxy/cli/build +++ b/dockerfiles/services/sslproxy/cli/build @@ -54,7 +54,7 @@ function assertMisdirectedRequest() { domain=$2 set -e echo -e "\033[94m${proto}://${domain}\033[39m testing for mistrected request" - curl --no-progress-meter -IskH "Host: ${domain}" "${proto}://localhost" | tee "$LOG" | grep "421 Misdirected Request" + curl -IskH "Host: ${domain}" "${proto}://localhost" | tee "$LOG" | grep "421 Misdirected Request" } function assertBadGateway() { @@ -62,7 +62,7 @@ function assertBadGateway() { domain=$2 set -e echo -e "\033[94m${proto}://${domain}\033[39m" - curl --no-progress-meter -IskH "Host: ${domain}" "${proto}://localhost" | tee "$LOG" | grep "502 Bad Gateway" + curl -IskH "Host: ${domain}" "${proto}://localhost" | tee "$LOG" | grep "502 Bad Gateway" } @@ -71,7 +71,7 @@ function assertTeapot() { domain=$2 set -e echo -e "\033[94m${proto}://${domain}\033[39m" - curl --no-progress-meter -IskH "Host: ${domain}" "${proto}://localhost" | tee "$LOG" | grep "418" + curl -IskH "Host: ${domain}" "${proto}://localhost" | tee "$LOG" | grep "418" } build_save() { diff --git a/dockerfiles/services/sslproxy/cli/deploy b/dockerfiles/services/sslproxy/cli/deploy index 826b56c..c1f4b96 100755 --- a/dockerfiles/services/sslproxy/cli/deploy +++ b/dockerfiles/services/sslproxy/cli/deploy @@ -78,7 +78,7 @@ function assertOK() { domain=$2 set -e echo -e "\033[94m${proto}://${domain}\033[39m" - curl --no-progress-meter -IskH "Host: ${domain}" "${proto}://dkhost.xai-corp.net" \ + curl -IskH "Host: ${domain}" "${proto}://dkhost.xai-corp.net" \ | tee "$LOG" | grep -P "200 OK|302 Found|403 Forbidden" } diff --git a/dockerfiles/services/sslproxy/renew.Jenkinsfile b/dockerfiles/services/sslproxy/renew.Jenkinsfile index c3ffa73..edcc0c5 100644 --- a/dockerfiles/services/sslproxy/renew.Jenkinsfile +++ b/dockerfiles/services/sslproxy/renew.Jenkinsfile @@ -21,7 +21,11 @@ pipeline { } stage('renew') { - steps { + options { + ansiColor('xterm') + timeout(2) + } + steps { dir(WORKDIR) { withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { sh "pwd"