Skip to content

Commit

Permalink
Skip unit tests on 1 of the CentOS7 builds since it's in
Browse files Browse the repository at this point in the history
  • Loading branch information
wied03 committed Aug 3, 2016
1 parent 935c513 commit 76a359e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -11,8 +11,9 @@ matrix:

include:
- env: CENTOS="centos66"
- env: CENTOS="centos67"
- env: CENTOS="centos7_email"
- env: CENTOS="centos67" SKIP_UNIT="true"
# email vs stdout only differs re: integration
- env: CENTOS="centos7_email" SKIP_UNIT="true"
- env: CENTOS="centos7_stdout"

# Docker related permissions issues on Travis
Expand Down
10 changes: 2 additions & 8 deletions Rakefile
Expand Up @@ -43,20 +43,14 @@ task :build => ['centos-package-cron.spec', :integration_image] do
end

task :unit_image do
if build_var == 'centos67'
# no 6.7 tests right now
next
end
next if ENV['SKIP_UNIT']

sh "docker build -t #{image_tag_unit} #{image_src_unit}"
end

desc 'Runs Python unit tests'
task :unit => :unit_image do
if build_var == 'centos67'
# no 6.7 tests right now
next
end
next if ENV['SKIP_UNIT']

sh "docker run --rm=true -e \"CENTOS=#{version_var}\" -v `pwd`:/code -w /code -u nonrootuser -t #{image_tag_unit} ./setup.py test"
end

0 comments on commit 76a359e

Please sign in to comment.