xai-corp.net/provisioning
1
0
Fork 0
Code Issues 9 Releases Activity

add color support in sslproxy Jenkinsfile, and removed curl flag for no progress meter.

Browse Source
This commit is contained in:
richard
2020-06-06 22:32:33 -04:00
parent 21a48d3d4d
commit 72f9dfc576
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dockerfiles/services/sslproxy/Jenkinsfile vendored
View File

@@ -21,6 +21,10 @@ pipeline {
} }
stage('build') { stage('build') {
options {
ansiColor('xterm')
timeout(2)
}
steps { steps {
dir(WORKDIR) { dir(WORKDIR) {
withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
@@ -32,6 +36,10 @@ pipeline {
} }
stage('deploy') { stage('deploy') {
options {
ansiColor('xterm')
timeout(2)
}
steps { steps {
dir(WORKDIR) { dir(WORKDIR) {
withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {

6
dockerfiles/services/sslproxy/cli/build
View File

@@ -54,7 +54,7 @@ function assertMisdirectedRequest() {
domain=$2 domain=$2
set -e set -e
echo -e "\033[94m${proto}://${domain}\033[39m testing for mistrected request" 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() { function assertBadGateway() {
@@ -62,7 +62,7 @@ function assertBadGateway() {
domain=$2 domain=$2
set -e set -e
echo -e "\033[94m${proto}://${domain}\033[39m" 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 domain=$2
set -e set -e
echo -e "\033[94m${proto}://${domain}\033[39m" 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() { build_save() {

2
dockerfiles/services/sslproxy/cli/deploy
View File

@@ -78,7 +78,7 @@ function assertOK() {
domain=$2 domain=$2
set -e set -e
echo -e "\033[94m${proto}://${domain}\033[39m" 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" | tee "$LOG" | grep -P "200 OK|302 Found|403 Forbidden"
} }

4
dockerfiles/services/sslproxy/renew.Jenkinsfile
View File

@@ -21,6 +21,10 @@ pipeline {
} }
stage('renew') { stage('renew') {
options {
ansiColor('xterm')
timeout(2)
}
steps { steps {
dir(WORKDIR) { dir(WORKDIR) {
withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {