Made base image fully configurable

Instead of allowing us to configure only the tag used by the base test image, now we made it generic and fully overridable. Signed-off-by: Sorin Sbarnea <[email protected]>
ansible · Oct 20, 2019 · 1fcd9a6 · 1fcd9a6
1 parent c9fee49
commit 1fcd9a6
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 26 deletions.
diff --git a/molecule/test/functional/docker/test_scenarios.py b/molecule/test/functional/docker/test_scenarios.py
@@ -221,10 +221,8 @@ def test_command_test_builds_local_molecule_image(
     scenario_to_test, with_scenario, scenario_name, driver_name
 ):
     try:
-        version = os.environ.get('TEST_CENTOS_VERSION', 7)
-        cmd = sh.docker.bake(
-            'rmi', 'molecule_local/centos:{}'.format(version), '--force'
-        )
+        image = os.environ.get('TEST_BASE_IMAGE', "pycontribs/centos:7")
+        cmd = sh.docker.bake('rmi', 'molecule_local/{}'.format(image), '--force')
         pytest.helpers.run_command(cmd)
     except sh.ErrorReturnCode:
         pass

diff --git a/molecule/test/resources/molecule_docker.yml b/molecule/test/resources/molecule_docker.yml
@@ -7,7 +7,7 @@ lint:
   name: yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   lint:

diff --git a/molecule/test/resources/playbooks/delegated/create/docker.yml b/molecule/test/resources/playbooks/delegated/create/docker.yml
@@ -3,7 +3,7 @@
   docker_container:
     name: delegated-instance-docker
     hostname: delegated-instance-docker
-    image: molecule_local/centos:${TEST_CENTOS_VERSION}
+    image: molecule_local/${TEST_BASE_IMAGE}
     recreate: false
     log_driver: json-file
     command: sleep infinity

diff --git a/molecule/test/scenarios/cleanup/molecule/default/molecule.yml b/molecule/test/scenarios/cleanup/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     command: /sbin/init
     privileged: true
 provisioner:

diff --git a/molecule/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml b/molecule/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml
@@ -14,7 +14,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/scenarios/dependency/molecule/gilt/molecule.yml b/molecule/test/scenarios/dependency/molecule/gilt/molecule.yml
@@ -14,7 +14,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/scenarios/dependency/molecule/shell/molecule.yml b/molecule/test/scenarios/dependency/molecule/shell/molecule.yml
@@ -15,7 +15,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/scenarios/driver/docker/molecule/ansible-verifier/molecule.yml b/molecule/test/scenarios/driver/docker/molecule/ansible-verifier/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     networks:
       - name: foo
       - name: bar

diff --git a/molecule/test/scenarios/driver/docker/molecule/default/molecule.yml b/molecule/test/scenarios/driver/docker/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     networks:
       - name: foo
       - name: bar

diff --git a/molecule/test/scenarios/driver/docker/molecule/multi-node/molecule.yml b/molecule/test/scenarios/driver/docker/molecule/multi-node/molecule.yml
@@ -9,14 +9,14 @@ lint:
     config-file: ../../../resources/.yamllint
 platforms:
   - name: instance-1
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     groups:
       - foo
       - bar
     buildargs:
       testarg: this_is_a_test
   - name: instance-2
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     groups:
       - foo
       - baz

diff --git a/molecule/test/scenarios/host_group_vars/molecule/default/molecule.yml b/molecule/test/scenarios/host_group_vars/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     groups:
       - example
     children:

diff --git a/molecule/test/scenarios/host_group_vars/molecule/links/molecule.yml b/molecule/test/scenarios/host_group_vars/molecule/links/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     groups:
       - example
     children:

diff --git a/molecule/test/scenarios/idempotence/molecule/raises/molecule.yml b/molecule/test/scenarios/idempotence/molecule/raises/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/scenarios/interpolation/molecule/default/molecule.yml b/molecule/test/scenarios/interpolation/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: $INSTANCE_NAME
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/scenarios/overrride_driver/molecule/default/molecule.yml b/molecule/test/scenarios/overrride_driver/molecule/default/molecule.yml
@@ -12,7 +12,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/scenarios/plugins/molecule/default/molecule.yml b/molecule/test/scenarios/plugins/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/scenarios/side_effect/molecule/default/molecule.yml b/molecule/test/scenarios/side_effect/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     command: /sbin/init
     privileged: true
 provisioner:

diff --git a/molecule/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml b/molecule/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml b/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   playbooks:

diff --git a/molecule/test/scenarios/verifier/molecule/testinfra/molecule.yml b/molecule/test/scenarios/verifier/molecule/testinfra/molecule.yml
@@ -9,7 +9,7 @@ lint:
     config-file: ../../resources/.yamllint
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
 provisioner:
   name: ansible
   config_options:

diff --git a/molecule/test/unit/model/v2/test_pre_validate.py b/molecule/test/unit/model/v2/test_pre_validate.py
@@ -97,7 +97,7 @@ def _model_molecule_env_errors_section_data():
   name: $MOLECULE_LINT_NAME
 platforms:
   - name: instance
-    image: centos:${TEST_CENTOS_VERSION}
+    image: ${TEST_BASE_IMAGE}
     networks:
       - name: foo
       - name: bar

diff --git a/tox.ini b/tox.ini
@@ -21,7 +21,7 @@ passenv = *
 setenv =
     ANSIBLE_CALLABLE_WHITELIST={env:ANSIBLE_CALLABLE_WHITELIST:timer,profile_roles}
     PYTHONDONTWRITEBYTECODE=1
-    TEST_CENTOS_VERSION=7
+    TEST_BASE_IMAGE=pycontribs/centos:7
     # -n auto used only on unit as is not supported by functional yet
     unit: PYTEST_ADDOPTS=molecule/test/unit/ --cov={toxinidir}/molecule/ --no-cov-on-fail {env:PYTEST_ADDOPTS:-n auto}
     functional: PYTEST_ADDOPTS=molecule/test/functional/ {env:PYTEST_ADDOPTS:}