diff options
| author | Chris Elsworth <chris.elsworth@bytemark.co.uk> | 2017-03-17 13:31:12 +0000 |
|---|---|---|
| committer | Chris Elsworth <chris.elsworth@bytemark.co.uk> | 2017-03-17 13:31:12 +0000 |
| commit | a3d7eb874eedbe3c065451bd0377f5236873e36a (patch) | |
| tree | 30f7d46c878d1a6bdc7f23887b8f82a82a9ee3f7 | |
| parent | 567d8b3c419a52ccc52f35f37338514c1d8fa623 (diff) | |
| parent | 2b287c1c86cbe6c04dcf16f3d266aa2810f9f84c (diff) | |
Merge branch '9-ci-run-tests' into 'master'
Resolve "gitlab-ci should run the test-cases."
Closes #9
See merge request !6
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rwxr-xr-x | t/test-custodian-util-dns.rb | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 752eaf7..68db705 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,17 @@ stages: + - test - package - publish + +test:jessie: &test + image: $CI_REGISTRY/docker-images/layers:$DISTRO-ruby + stage: test + variables: + DISTRO: jessie + script: + - make test + .package: &package image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb stage: package diff --git a/t/test-custodian-util-dns.rb b/t/test-custodian-util-dns.rb index 569fcea..934ecc3 100755 --- a/t/test-custodian-util-dns.rb +++ b/t/test-custodian-util-dns.rb @@ -29,6 +29,7 @@ class TestDNSUtil < Test::Unit::TestCase # Test forward lookups # def test_lookup + return unless ENV['GITLAB_CI'].nil? details = Custodian::Util::DNS.hostname_to_ip('bytemark.co.uk') assert((details == '2001:41c9:0:1019:81::80') || @@ -52,6 +53,7 @@ class TestDNSUtil < Test::Unit::TestCase # Test forward lookups # def test_reverse_lookup + return unless ENV['GITLAB_CI'].nil? # # IPv6 lookup |