diff --git a/Jenkinsfile b/Jenkinsfile index 42b5527..0478d43 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,12 +104,8 @@ pipeline { stage('Integration Tests') { steps { - sh 'mkdir -p test/results/integration/thelinux.pro' - sh 'mkdir -p test/results/integration/kameronkenny.com' - sh 'mkdir -p test/results/integration/in.thelinuxpro.net' - sh 'bats -F junit --gather-test-outputs-in test/results/integration/thelinux.pro test/integration/dns/thelinux.pro/*.bat test/integration/dns/thelinux.pro/**/*.bat' - sh 'bats -F junit --gather-test-outputs-in test/results/integration/kameronkenny.com test/integration/dns/kameronkenny.com/*.bat test/integration/dns/kameronkenny.com/**/*.bat' - sh 'bats -F junit --gather-test-outputs-in test/results/integration/in.thelinuxpro.net test/integration/dns/in.thelinuxpro.net/*.bat test/integration/dns/in.thelinuxpro.net/**/*.bat' + sh 'mkdir -p test/results/integration/dns' + sh 'bats -F junit --gather-test-outputs-in test/results/integration/dns test/integration/dns/**/*.bat test/integration/dns/**/**/*.bat' } } } diff --git a/test/integration/dns/in.thelinuxpro.net/tests.bat b/test/integration/dns/in.thelinuxpro.net/tests.bat index 53b4976..aff47fa 100644 --- a/test/integration/dns/in.thelinuxpro.net/tests.bat +++ b/test/integration/dns/in.thelinuxpro.net/tests.bat @@ -19,8 +19,3 @@ load 'helper' run _check_soa_record_at_ns1 assert_output --partial "${serial}" } - -@test "Test SOA Record @ns2: ${domain}" { - run _check_soa_record_at_ns2 - assert_output --partial "${serial}" -} diff --git a/test/integration/dns/kameronkenny.com/tests.bat b/test/integration/dns/kameronkenny.com/tests.bat index 53b4976..aff47fa 100644 --- a/test/integration/dns/kameronkenny.com/tests.bat +++ b/test/integration/dns/kameronkenny.com/tests.bat @@ -19,8 +19,3 @@ load 'helper' run _check_soa_record_at_ns1 assert_output --partial "${serial}" } - -@test "Test SOA Record @ns2: ${domain}" { - run _check_soa_record_at_ns2 - assert_output --partial "${serial}" -} diff --git a/test/integration/dns/thelinux.pro/tests.bat b/test/integration/dns/thelinux.pro/tests.bat index 53b4976..1490450 100644 --- a/test/integration/dns/thelinux.pro/tests.bat +++ b/test/integration/dns/thelinux.pro/tests.bat @@ -15,12 +15,8 @@ load 'helper' assert_output --partial "${serial}" } +# Only test at primary NS @test "Test SOA Record @ns1: ${domain}" { run _check_soa_record_at_ns1 assert_output --partial "${serial}" } - -@test "Test SOA Record @ns2: ${domain}" { - run _check_soa_record_at_ns2 - assert_output --partial "${serial}" -}