Skip to content

Commit 2e8f993

Browse files
committedJun 7, 2017
Include Fedora test image in-repo
Testing with a Fedora host requires using a special test image. Formerly this was hosted/setup externally, but it's more convenient to include it directly. The default options for building it remain commented out, and setting up the name in ``defaults.ini`` will be documented in a later commit. Also fix the order of test-image options in ``defaults.ini`` so they follow the FQIN format sequence. i.e. host/user/name:tag Signed-off-by: Chris Evich <[email protected]>
1 parent df6a76d commit 2e8f993

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed
 

‎config_defaults/defaults.ini

+4-5
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,17 @@ docker_timeout = 300.0
2929
#: option is compounded from defaults, not overwritten!**
3030
__example__ = docker_repo_name, docker_repo_tag, preserve_fqins
3131

32+
#: remote components (host:port)
33+
docker_registry_host = registry.access.redhat.com
34+
#: remote components (username)
35+
docker_registry_user = rhel7
3236
#: Default registry settings for testing
3337
#: (blank if not applicable)
3438
docker_repo_name = rhel
3539
#: Default image settings for testing
3640
#: (blank if not applicable)
3741
docker_repo_tag = latest
3842

39-
#: remote components (host:port)
40-
docker_registry_host = registry.access.redhat.com
41-
#: remote components (username)
42-
docker_registry_user = rhel7
43-
4443
##### Operational testing options
4544

4645
#: Attempt to remove all created containers/images during test

‎config_defaults/docker_test_images.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extra_fqins_csv = docker.io/stackbrew/centos:latest
1010
#: with any images pulled, built, etc. from sub-subtests.
1111
update_defaults_ini = True
1212

13-
#: Name of image, dockerfile location, and options to build.
14-
#: build_name = skip-if-commented-out
15-
#: build_dockerfile = skip-if-commented-out
16-
build_opts_csv = --no-cache,--pull,--force-rm,--volume=/:/host
13+
#: Name of image, dockerfile location, and options to build. For example:
14+
#: build_name = localhost/fedora_test_image:latest
15+
#: build_dockerfile = https://raw.githubusercontent.com/autotest/autotest-docker/master/fedora_test_image.tar.gz
16+
build_opts_csv = --no-cache,--pull,--force-rm

‎fedora_test_image.tar.gz

311 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.