Skip to content

(REPLATS-101) Update spec helpers for > 1 image #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Iristyle merged 1 commit into from
Apr 8, 2021
Merged

(REPLATS-101) Update spec helpers for > 1 image #232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions gem/lib/pupperware/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def load_compose_services=(value)
@@load_compose_services = value
end

# may include multiple comma separated images
# returns a string if only one is present for backward compatibility
# otherwise returns an array of images
def require_test_image()
image = ENV['PUPPET_TEST_DOCKER_IMAGE']
if image.nil?
Expand All @@ -33,7 +36,7 @@ def require_test_image()
* * * * *
MSG
end
image
image.include?(',') ? image.split(',') : image
end

######################################################################
Expand Down Expand Up @@ -366,13 +369,13 @@ def get_service_container(service, timeout = 5)
# in the compose file.
# Typically the ignored service will be the one under test, since in
# that case we want to use the image we just built, not the latest released.
def pull_images(ignore_service = nil)
def pull_images(ignore_services = nil)
services = docker_compose('config --services')[:stdout].chomp
if ignore_service.nil?
if ignore_services.nil?
puts "Pulling images"
else
puts "Pulling images (ignoring image for service #{ignore_service})"
services.sub!(/^#{ignore_service}$/, '')
puts "Pulling images (ignoring image for service(s) #{ignore_services})"
[ignore_services].flatten.each { |s| services.sub!(/^#{s}$/, '') }
end
services.gsub!("\n", ' ')
docker_compose("pull --quiet #{services}", stream: STDOUT)
Expand Down