mirror of https://github.com/containers/podman.git
				
				
				
			CI: system tests: always create pause image
...not just when running parallel Bats, because Bats does not provide any way to know if we're parallel. Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
		
							parent
							
								
									5e5c68ffbe
								
							
						
					
					
						commit
						1d5c8ac18e
					
				|  | @ -458,16 +458,16 @@ function clean_setup() { | ||||||
|         _prefetch $PODMAN_TEST_IMAGE_FQN |         _prefetch $PODMAN_TEST_IMAGE_FQN | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     # When running in parallel, load (create, actually) the pause image. |     # Load (create, actually) the pause image. This way, all pod tests will | ||||||
|     # This way, all pod tests will have it available. Without this, |     # have it available. Without this, pod tests run in parallel will leave | ||||||
|     # parallel pod tests will leave behind <none>:<none> images. |     # behind <none>:<none> images. | ||||||
|  |     # FIXME: we have to do this always, because there's no way (in bats 1.11) | ||||||
|  |     #        to tell if we're running in parallel. See bats-core#998 | ||||||
|     # FIXME: #23292 -- this should not be necessary. |     # FIXME: #23292 -- this should not be necessary. | ||||||
|     if [[ -n "$PARALLEL_JOBSLOT" ]]; then |  | ||||||
|     run_podman pod create mypod |     run_podman pod create mypod | ||||||
|     run_podman pod rm mypod |     run_podman pod rm mypod | ||||||
|     # And now, we have a pause image, and each test does not |     # And now, we have a pause image, and each test does not | ||||||
|     # need to build their own. |     # need to build their own. | ||||||
|     fi |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| # END   setup/teardown tools | # END   setup/teardown tools | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue