From 45f7aaa7246bc48b00d2509ee1f35d619cdc26c2 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 31 Aug 2016 11:38:08 -0400 Subject: [PATCH] Cleaning up tests by specifying hostname not socket, and rebuilding image in pipeline --- Jenkinsfile | 2 +- tests/running.bats | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8832e81..4c8731c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ node('docker') { stage 'Build' try{ - sh 'bin/build.sh &> debug' + sh 'bin/rebuild.sh &> debug' } catch(error) { def error_details = readFile('./debug'); def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}" diff --git a/tests/running.bats b/tests/running.bats index 78075be..2212116 100644 --- a/tests/running.bats +++ b/tests/running.bats @@ -9,9 +9,9 @@ load ../common } @test "Creates root account and database" { - docker exec -i $imagename mysql -u root --password="123321" -e 'show tables' registry + docker exec -i $imagename mysql -u root --password="123321" -h 127.0.0.1 -e 'show tables' registry } @test "Creates user account with password" { - docker exec -i $imagename mysql -u registry_user --password="WJzesbe3poNZ91qIbmR7" -e 'show tables' registry + docker exec -i $imagename mysql -u registry_user --password="WJzesbe3poNZ91qIbmR7" -h 127.0.0.1 -e 'show tables' registry } \ No newline at end of file